Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:45:25 +0000 (01:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:46:51 +0000 (01:46 +0100)
* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55':
  mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg4video.h
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h

Simple merge
@@@ -115,12 -106,8 +115,12 @@@ static av_cold int mpeg4video_parse_ini
  {
      struct Mp4vParseContext *pc = s->priv_data;
  
 +    ff_mpeg4videodec_static_init();
 +
      pc->first_picture           = 1;
 +    pc->dec_ctx.m.quant_precision     = 5;
      pc->dec_ctx.m.slice_context_count = 1;
-     pc->dec_ctx.m.showed_packed_warning = 1;
++    pc->dec_ctx.showed_packed_warning = 1;
      return 0;
  }
  
@@@ -2065,11 -2016,10 +2065,11 @@@ static int decode_user_data(Mpeg4DecCon
          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");
 +            av_log(s->avctx, AV_LOG_INFO, "Video uses a non-standard and "
 +                   "wasteful way to store B-frames ('packed B-frames'). "
 +                   "Consider using a tool like VirtualDub or avidemux to fix it.\n");
-             s->showed_packed_warning = 1;
+             ctx->showed_packed_warning = 1;
          }
      }
  
Simple merge