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/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/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index b7018176b4..a78d23e95a 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -367,7 +367,7 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo v->overlap = get_bits1(gb); //common - v->s.resync_marker = get_bits1(gb); + v->resync_marker = get_bits1(gb); v->rangered = get_bits1(gb); if (v->rangered && v->profile == PROFILE_SIMPLE) { av_log(avctx, AV_LOG_INFO, @@ -408,7 +408,7 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo "DQuant=%i, Quantizer mode=%i, Max B frames=%i\n", v->profile, v->frmrtq_postproc, v->bitrtq_postproc, v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv, - v->rangered, v->vstransform, v->overlap, v->s.resync_marker, + v->rangered, v->vstransform, v->overlap, v->resync_marker, v->dquant, v->quantizer_mode, avctx->max_b_frames); return 0; } |