[FFmpeg-cvslog] r20515 - trunk/libavformat/utils.c

[diego]

Author: diego
Date: Wed Nov 11 22:57:50 2009
New Revision: 20515

Log:
Add '#undef fprintf' before PRINT macro that uses fprintf.
Otherwise there may be trouble when fprintf is disabled in favor of av_log.

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Wed Nov 11 21:36:42 2009	(r20514)
+++ trunk/libavformat/utils.c	Wed Nov 11 22:57:50 2009	(r20515)
@@ -3219,6 +3219,7 @@ int av_get_frame_filename(char *buf, int
 static void hex_dump_internal(void *avcl, FILE *f, int level, uint8_t *buf, int size)
 {
     int len, i, j, c;
+#undef fprintf
 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
 
     for(i=0;i<size;i+=16) {
@@ -3257,6 +3258,7 @@ void av_hex_dump_log(void *avcl, int lev
  //FIXME needs to know the time_base
 static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload)
 {
+#undef fprintf
 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
     PRINT("stream #%d:\n", pkt->stream_index);
     PRINT("  keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0));