Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:26:27 +0000 (21:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:26:59 +0000 (21:26 +0200)
* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
  mpegvideo: move vol_control_parameters to the only place it is used

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

@@@ -93,9 -92,10 +93,11 @@@ typedef struct Mpeg4DecContext 
      int divx_build;
      int xvid_build;
      int lavc_build;
 -    ///< flag for having shown the warning about divxs invalid b frames
 +
 +    /// flag for having shown the warning about divxs invalid b frames
      int showed_packed_warning;
+     int vol_control_parameters; /**< does the stream contain the low_delay flag,
+                                  *   used to work around buggy encoders. */
  
      int cplx_estimation_trash_i;
      int cplx_estimation_trash_p;
@@@ -2446,12 -2276,9 +2446,12 @@@ static int decode_vop_header(Mpeg4DecCo
                     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" : " ", ctx->intra_dc_threshold,
+                    ctx->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