[SCM] libav/experimental: Add '#undef fprintf' before PRINT macro that uses fprintf. Otherwise there may be trouble when fprintf is disabled in favor of av_log.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ca02d8ec97ce50bfc36ff094d46afa331559ea64
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Nov 11 21:57:50 2009 +0000

    Add '#undef fprintf' before PRINT macro that uses fprintf.
    Otherwise there may be trouble when fprintf is disabled in favor of av_log.
    
    Originally committed as revision 20515 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e54a6f3..a9d07fa 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3219,6 +3219,7 @@ int av_get_frame_filename(char *buf, int buf_size,
 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 level, uint8_t *buf, int size)
  //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));

-- 
Libav/FFmpeg packaging