diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:09:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:09:13 +0200 |
| commit | 2a56e65c3b3b53a3a51f290faa33ce0a852cd2a1 (patch) | |
| tree | efde2c2d9143d3c7cf103384b19e9a386bf05404 /libavcodec | |
| parent | d0707677fa50f7d75a945e234287a4661962c851 (diff) | |
| parent | 5d2be71b9ecf2a88752666a2c4039f4d98419d35 (diff) | |
| download | ffmpeg-2a56e65c3b3b53a3a51f290faa33ce0a852cd2a1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: Use codec ID from AVCodecContext while parsing frame header
avplay: support mid-stream sample rate changes
Conflicts:
ffplay.c
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index ae07d177cb..c24951b2d8 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -585,7 +585,7 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) v->interpfrm = get_bits1(gb); if (!v->s.avctx->codec) return -1; - if (v->s.avctx->codec->id == AV_CODEC_ID_MSS2) + if (v->s.avctx->codec_id == AV_CODEC_ID_MSS2) v->respic = v->rangered = v->multires = get_bits(gb, 2) == 1; |