diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:58:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 01:28:04 +0100 |
| commit | ee9d53e5726250295cfe0b9e67518fdd1475390e (patch) | |
| tree | 49c8d062310d87707522dee0db6efdc3d084fce3 /libavcodec/vaapi_mpeg4.c | |
| parent | 2d2b363c652403ac0bda129912e1910aacdaa3fc (diff) | |
| parent | 48e139409556861c9e561ce34133891d8eecc3cf (diff) | |
| download | ffmpeg-ee9d53e5726250295cfe0b9e67518fdd1475390e.tar.gz | |
Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'
* commit '48e139409556861c9e561ce34133891d8eecc3cf':
mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg4.c')
| -rw-r--r-- | libavcodec/vaapi_mpeg4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index d54596661f..2fdb10fb1b 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -72,7 +72,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->vol_fields.bits.quarter_sample = s->quarter_sample; pic_param->vol_fields.bits.data_partitioned = s->data_partitioning; pic_param->vol_fields.bits.reversible_vlc = ctx->rvlc; - pic_param->vol_fields.bits.resync_marker_disable = !s->resync_marker; + pic_param->vol_fields.bits.resync_marker_disable = !ctx->resync_marker; pic_param->no_of_sprite_warping_points = s->num_sprite_warping_points; for (i = 0; i < s->num_sprite_warping_points && i < 3; i++) { pic_param->sprite_trajectory_du[i] = s->sprite_traj[i][0]; |