aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-01-15 23:26:09 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-01-15 23:26:09 +0000
commit0e066acb62a7ef4e54b55b3ebd56190ddf171d66 (patch)
tree1ff1b5d0c912f93e22591067fbc4dd111c5b5422 /libavcodec
parentc33fc0a5409d19eb04ac7135e3e2b4c77bee654f (diff)
downloadffmpeg-0e066acb62a7ef4e54b55b3ebd56190ddf171d66.tar.gz
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.mpg and http://sam.zoy.org/zzuf/lol-ffplay.m2v
Originally committed as revision 7538 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpeg12.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 36d7153519..27d689f1b5 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -3178,6 +3178,10 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
if(mpeg_field_start(s2) < 0)
return -1;
}
+ if(!s2->current_picture_ptr){
+ av_log(avctx, AV_LOG_ERROR, "current_picture not initalized\n");
+ return -1;
+ }
if(avctx->thread_count > 1){
int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;