[FFmpeg-cvslog] r15772 - in trunk/libavcodec: h263.c mpegvideo.h

andoma subversion
Tue Nov 4 07:54:43 CET 2008


Author: andoma
Date: Tue Nov  4 07:54:42 2008
New Revision: 15772

Log:
Only warn about "Invalid and inefficient vfw-avi packed B frames" once.

Patch by Andrew Savchenko, Bircoph at list dot ru



Modified:
   trunk/libavcodec/h263.c
   trunk/libavcodec/mpegvideo.h

Modified: trunk/libavcodec/h263.c
==============================================================================
--- trunk/libavcodec/h263.c	(original)
+++ trunk/libavcodec/h263.c	Tue Nov  4 07:54:42 2008
@@ -5751,8 +5751,10 @@ static int decode_user_data(MpegEncConte
         s->divx_version= ver;
         s->divx_build= build;
         s->divx_packed= e==3 && last=='p';
-        if(s->divx_packed)
+        if(s->divx_packed && !s->showed_packed_warning) {
             av_log(s->avctx, AV_LOG_WARNING, "Invalid and inefficient vfw-avi packed B frames detected\n");
+            s->showed_packed_warning=1;
+        }
     }
 
     /* ffmpeg detection */

Modified: trunk/libavcodec/mpegvideo.h
==============================================================================
--- trunk/libavcodec/mpegvideo.h	(original)
+++ trunk/libavcodec/mpegvideo.h	Tue Nov  4 07:54:42 2008
@@ -487,6 +487,7 @@ typedef struct MpegEncContext {
     /* H.263 specific */
     int gob_index;
     int obmc;                       ///< overlapped block motion compensation
+    int showed_packed_warning;      ///< flag for having shown the warning about divxs invalid b frames
 
     /* H.263+ specific */
     int umvplus;                    ///< == H263+ && unrestricted_mv




More information about the ffmpeg-cvslog mailing list