diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:48:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:49:34 +0100 |
| commit | 2d614e9be14cb493c56448467b38865137e9e855 (patch) | |
| tree | 14d22cd1866e8eccf57c632cf447636bfeb22230 /libavcodec/dxva2_vc1.c | |
| parent | 26b526e776a4ee7b88775f12c75b0a87fcc0e8e4 (diff) | |
| parent | c2f7417eeb9cc31f75e71f7be2780f90f1628d7e (diff) | |
| download | ffmpeg-2d614e9be14cb493c56448467b38865137e9e855.tar.gz | |
Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'
* commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
vc1: move MpegEncContext.resync_marker into VC1Context.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 92c78fdf55..2e9a00eb07 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; |