Avoid segfault on ffmpeg "buffer flush" in mpeg12.c patch by (Wolfram Gloger <wmglo...

Originally committed as revision 3324 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 9acdd2e..5a2df29 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2769,12 +2769,14 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
     MpegEncContext *s2 = &s->mpeg_enc_ctx;
     dprintf("fill_buffer\n");
 
     MpegEncContext *s2 = &s->mpeg_enc_ctx;
     dprintf("fill_buffer\n");
 

-    /* special case for last picture */
-    if (buf_size == 0 && s2->low_delay==0 && s2->next_picture_ptr) {
-        *picture= *(AVFrame*)s2->next_picture_ptr;
-        s2->next_picture_ptr= NULL;
+    if (buf_size == 0) {
+       /* special case for last picture */
+       if (s2->low_delay==0 && s2->next_picture_ptr) {
+           *picture= *(AVFrame*)s2->next_picture_ptr;
+           s2->next_picture_ptr= NULL;

 
 

-        *data_size = sizeof(AVFrame);
+           *data_size = sizeof(AVFrame);
+       }

         return 0;
     }
 
         return 0;
     }