10l, fails to compile when debug enabled

Originally committed as revision 4998 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asf.c b/libavformat/asf.c
index a3edf77..b0d0370 100644 (file)
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -71,7 +71,7 @@ static void print_guid(const GUID *g)
         printf(" 0x%02x,", g->v4[i]);
     printf("}\n");
 }
-#undef PRINT_IF_GUID(g,cmp)
+#undef PRINT_IF_GUID
 #endif
 
 static void get_guid(ByteIOContext *s, GUID *g)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 5a2a0fe..06a0bfd 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2230,7 +2230,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
 
     // Step 2. Find the corresponding sample using the Time-to-sample atom (stts) */
 #ifdef DEBUG
-  av_log(s, AV_LOG_DEBUG, "Searching for time %li in stream #%i (time_scale=%i)\n", (long)timestamp, mov_idx, sc->time_scale);
+  av_log(s, AV_LOG_DEBUG, "Searching for time %li in stream #%i (time_scale=%i)\n", (long)sample_time, mov_idx, sc->time_scale);
 #endif
     start_time = 0; // FIXME use elst atom
     sample = 1; // sample are 0 based in table