diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:26:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:27:30 +0100 |
| commit | 9c835acc1da49919449f11d2f86b3422aee85ea0 (patch) | |
| tree | 16af0df43149b7fabe72363237707dfe7caa2374 /libavcodec/vaapi_mpeg4.c | |
| parent | cdc21e4abe2a0e9394638bb09086ac2068f0683b (diff) | |
| parent | bc5abfb19e7ff00b859120561d6ffd622c7904fe (diff) | |
Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'
* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
mpeg4videodec: move MpegEncContext.rvlc to 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 f64245fcad..d54596661f 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -71,7 +71,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->vol_fields.bits.quant_type = s->mpeg_quant; 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 = s->rvlc; + pic_param->vol_fields.bits.reversible_vlc = ctx->rvlc; pic_param->vol_fields.bits.resync_marker_disable = !s->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++) { |