[FFmpeg-cvslog] huffyuv: Check memory allocation

Vittorio Giovara git at videolan.org
Mon Jun 1 02:08:00 CEST 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sun May 31 14:54:03 2015 +0200| [7d2a6826912b629f17f3b0c5268e334fa123c4c9] | committer: Luca Barbato

huffyuv: Check memory allocation

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

 libavcodec/huffyuvenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index 6b3ff76..175b256 100644
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -155,7 +155,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
     s->version = 2;
 
     avctx->coded_frame = av_frame_alloc();
-    if (!avctx->coded_frame)
+    if (!avctx->extradata || !avctx->stats_out || !avctx->coded_frame)
         return AVERROR(ENOMEM);
 
     avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;



More information about the ffmpeg-cvslog mailing list