[FFmpeg-cvslog] indeo4: Skip null frames.

Michael Niedermayer git at videolan.org
Sun Mar 18 14:11:12 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 18 13:57:20 2012 +0100| [572c0ddc89709035cb733da870aa50373ffbd7e1] | committer: Michael Niedermayer

indeo4: Skip null frames.

Fixes crashes from Ticket845

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=572c0ddc89709035cb733da870aa50373ffbd7e1
---

 libavcodec/indeo4.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 573718e..eafd92b 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -761,6 +761,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
             av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n");
     }
 
+    if (ctx->frame_type >= FRAMETYPE_NULL_FIRST)
+        return buf_size;
+
     if (ctx->frame.data[0])
         avctx->release_buffer(avctx, &ctx->frame);
 



More information about the ffmpeg-cvslog mailing list