diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 12:18:44 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | c2f7417eeb9cc31f75e71f7be2780f90f1628d7e (patch) | |
| tree | 79020d21ae2503f4eebf1c8a0a3ac9ef95604cd6 /libavcodec/dxva2_vc1.c | |
| parent | a5a71992cae34b321ceb8374f44ce17a945a3881 (diff) | |
| download | ffmpeg-c2f7417eeb9cc31f75e71f7be2780f90f1628d7e.tar.gz | |
vc1: move MpegEncContext.resync_marker into VC1Context.
The field still remains in MpegEncContext because it is used by the
mpeg4 decoder.
Diffstat (limited to 'libavcodec/dxva2_vc1.c')
| -rw-r--r-- | libavcodec/dxva2_vc1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 4af3ce8127..a72d91efa3 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -97,7 +97,7 @@ static void fill_picture_parameters(AVCodecContext *avctx, (v->vstransform ); pp->bPicOverflowBlocks = (v->quantizer_mode << 6) | (v->multires << 5) | - (s->resync_marker << 4) | + (v->resync_marker << 4) | (v->rangered << 3) | (s->max_b_frames ); pp->bPicExtrapolation = (!v->interlace || v->fcm == PROGRESSIVE) ? 1 : 2; |