aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMashiat Sarker Shakkhar <mashiat.sarker@gmail.com>2012-10-11 13:13:56 -0400
committerKostya Shishkov <kostya.shishkov@gmail.com>2012-10-13 08:33:07 +0200
commit5d2be71b9ecf2a88752666a2c4039f4d98419d35 (patch)
tree57654a065b774ddb8331d92e0f42c3c65ed476b9
parent6304f78edf6a3a119c2e2d9adfed5437ad2e5de7 (diff)
downloadffmpeg-5d2be71b9ecf2a88752666a2c4039f4d98419d35.tar.gz
vc1: Use codec ID from AVCodecContext while parsing frame header
This fixes a segfault with samples that I have (both of them MPEG-TS). Looks like avctx->codec is not being set during parsing. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
-rw-r--r--libavcodec/vc1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index c7edc25a25..a8dd38ad5f 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -576,7 +576,7 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
if (v->finterpflag)
v->interpfrm = get_bits1(gb);
- 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;