summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2010-09-26 13:56:50 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2010-09-26 13:56:50 +0000
commitcba322d76d4a00b659d7de030018d6003820c715 (patch)
treef72c85848ffa978d6f59fe419dd08c4f2f1a3d1e /libavcodec/vc1dec.c
parent10f93363b77b0fdd42acf5626ed896703908c9d3 (diff)
Make WMV3 decoder attempt to decode WMVP as well
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8c9cbcd9db..c9a547b615 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3240,6 +3240,11 @@ static int vc1_decode_frame(AVCodecContext *avctx,
}
}
+ if(v->res_sprite && (s->pict_type!=FF_I_TYPE)){
+ av_free(buf2);
+ return -1;
+ }
+
// for hurry_up==5
s->current_picture.pict_type= s->pict_type;
s->current_picture.key_frame= s->pict_type == FF_I_TYPE;