virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-10-13 17:09:13 +02:00
commit 2a56e65c3b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1.c
View File

@ -585,7 +585,7 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
v->interpfrm = get_bits1(gb); v->interpfrm = get_bits1(gb);
if (!v->s.avctx->codec) if (!v->s.avctx->codec)
return -1; 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->respic =
v->rangered = v->rangered =
v->multires = get_bits(gb, 2) == 1; v->multires = get_bits(gb, 2) == 1;