mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
authorAnton Khirnov <anton@khirnov.net>
Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)
committerAnton Khirnov <anton@khirnov.net>
Thu, 5 Dec 2013 12:22:37 +0000 (13:22 +0100)
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h

index 9e1c8d9..59358eb 100644 (file)
@@ -92,6 +92,8 @@ typedef struct Mpeg4DecContext {
     int divx_build;
     int xvid_build;
     int lavc_build;
+    ///< flag for having shown the warning about divxs invalid b frames
+    int showed_packed_warning;
 
     int cplx_estimation_trash_i;
     int cplx_estimation_trash_p;
index 4f912ed..0e41548 100644 (file)
@@ -2016,10 +2016,10 @@ static int decode_user_data(Mpeg4DecContext *ctx, GetBitContext *gb)
         ctx->divx_version = ver;
         ctx->divx_build   = build;
         s->divx_packed  = e == 3 && last == 'p';
-        if (s->divx_packed && !s->showed_packed_warning) {
+        if (s->divx_packed && !ctx->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;
+            ctx->showed_packed_warning = 1;
         }
     }
 
index 76e84b5..ae6118f 100644 (file)
@@ -553,7 +553,6 @@ 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
     int mb_info;                    ///< interval for outputting info about mb offsets as side data
     int prev_mb_info, last_mb_info;
     uint8_t *mb_info_ptr;