Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:38:55 +0000 (01:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:38:55 +0000 (01:38 +0100)
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
  mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

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

Simple merge
@@@ -2358,11 -2180,7 +2358,11 @@@ static int decode_vop_header(Mpeg4DecCo
          if (s->pict_type == AV_PICTURE_TYPE_B)
              skip_bits_long(gb, ctx->cplx_estimation_trash_b);
  
-         s->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)];
 +        if (get_bits_left(gb) < 3) {
 +            av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n");
 +            return -1;
 +        }
+         ctx->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)];
          if (!s->progressive_sequence) {
              s->top_field_first = get_bits1(gb);
              s->alternate_scan  = get_bits1(gb);
                     s->data_partitioning, ctx->resync_marker,
                     ctx->num_sprite_warping_points, s->sprite_warping_accuracy,
                     1 - s->no_rounding, s->vo_type,
-                    s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold,
+                    s->vol_control_parameters ? " VOLC" : " ", ctx->intra_dc_threshold,
                     ctx->cplx_estimation_trash_i, ctx->cplx_estimation_trash_p,
 -                   ctx->cplx_estimation_trash_b);
 +                   ctx->cplx_estimation_trash_b,
 +                   s->time,
 +                   time_increment
 +                  );
          }
  
          if (!ctx->scalability) {
Simple merge
Simple merge