[vlmc-devel] commit: Revert "Replace PRId64 by %p" ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Sep 19 04:07:18 2010 +0200| [9dd765ba9541b1e36337778200bb2a5089cac282] | committer: Hugo Beauzée-Luyssen 

Revert "Replace PRId64 by %p"

This reverts commit e7f23f35f5f0280eca61e4b8dc344356d1916075.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=9dd765ba9541b1e36337778200bb2a5089cac282
---

 src/LibVLCpp/VLCMedia.cpp         |   12 ++++++------
 src/Renderer/WorkflowRenderer.cpp |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/LibVLCpp/VLCMedia.cpp b/src/LibVLCpp/VLCMedia.cpp
index c2ed19d..f4233a7 100644
--- a/src/LibVLCpp/VLCMedia.cpp
+++ b/src/LibVLCpp/VLCMedia.cpp
@@ -52,7 +52,7 @@ void
 Media::setVideoLockCallback( void* callback )
 {
     char    param[64];
-    sprintf( param, ":sout-smem-video-prerender-callback=%p", callback );
+    sprintf( param, ":sout-smem-video-prerender-callback=%"PRId64, (intptr_t)callback );
     addOption(param);
 }
 
@@ -60,7 +60,7 @@ void
 Media::setVideoUnlockCallback( void* callback )
 {
     char    param[64];
-    sprintf( param, ":sout-smem-video-postrender-callback=%p", callback );
+    sprintf( param, ":sout-smem-video-postrender-callback=%"PRId64, (intptr_t)callback );
     addOption( param );
 }
 
@@ -68,7 +68,7 @@ void
 Media::setAudioLockCallback( void* callback )
 {
     char    param[64];
-    sprintf( param, ":sout-smem-audio-prerender-callback=%p", callback );
+    sprintf( param, ":sout-smem-audio-prerender-callback=%"PRId64, (intptr_t)callback );
     addOption(param);
 }
 
@@ -76,7 +76,7 @@ void
 Media::setAudioUnlockCallback( void* callback )
 {
     char    param[64];
-    sprintf( param, ":sout-smem-audio-postrender-callback=%p", callback );
+    sprintf( param, ":sout-smem-audio-postrender-callback=%"PRId64, (intptr_t)callback );
     addOption( param );
 }
 
@@ -85,7 +85,7 @@ Media::setVideoDataCtx( void* dataCtx )
 {
     char    param[64];
 
-    sprintf( param, ":sout-smem-video-data=%p", dataCtx );
+    sprintf( param, ":sout-smem-video-data=%"PRId64, (intptr_t)dataCtx );
     addOption( param );
 }
 
@@ -94,7 +94,7 @@ Media::setAudioDataCtx( void* dataCtx )
 {
     char    param[64];
 
-    sprintf( param, ":sout-smem-audio-data=%p", dataCtx );
+    sprintf( param, ":sout-smem-audio-data=%"PRId64, (intptr_t)dataCtx );
     addOption( param );
 }
 
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index 3745681..8d56b00 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -110,11 +110,11 @@ WorkflowRenderer::setupRenderer( quint32 width, quint32 height, double fps )
     m_media = new LibVLCpp::Media( "imem://" + QString( videoString ) );
     m_media->addOption( inputSlave );
 
-    sprintf( buffer, "imem-get=%p", getLockCallback() );
+    sprintf( buffer, "imem-get=%"PRId64, (intptr_t)getLockCallback() );
     m_media->addOption( buffer );
-    sprintf( buffer, ":imem-release=%p", getUnlockCallback() );
+    sprintf( buffer, ":imem-release=%"PRId64, (intptr_t)getUnlockCallback() );
     m_media->addOption( buffer );
-    sprintf( buffer, ":imem-data=%p", m_esHandler );
+    sprintf( buffer, ":imem-data=%"PRId64, (intptr_t)m_esHandler );
     m_media->addOption( buffer );
     m_media->addOption( ":text-renderer dummy" );
 }