summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpeg12.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2007-01-28 18:38:32 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2007-01-28 18:38:32 +0000
commit7c3728d769962d288b73cc945c3143ae68726984 (patch)
tree36f762f4ce762a77ed0333711f628c40ba1a0f98 /src/libffmpeg/libavcodec/mpeg12.c
parent9add5e858c10b369eb44fe7ab618efb37eb3c585 (diff)
downloadxine-lib-7c3728d769962d288b73cc945c3143ae68726984.tar.gz
xine-lib-7c3728d769962d288b73cc945c3143ae68726984.tar.bz2
another ffmpeg sync to include h264 security fixes
CVS patchset: 8573 CVS date: 2007/01/28 18:38:32
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg12.c')
-rw-r--r--src/libffmpeg/libavcodec/mpeg12.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg12.c b/src/libffmpeg/libavcodec/mpeg12.c
index 8af7bdfa7..63fb00feb 100644
--- a/src/libffmpeg/libavcodec/mpeg12.c
+++ b/src/libffmpeg/libavcodec/mpeg12.c
@@ -3185,6 +3185,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;