[FFmpeg-cvslog] yop: only set extradata size after it has been successfully allocated

Anton Khirnov git at videolan.org
Sun May 18 14:11:31 CEST 2014


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat May  3 10:48:03 2014 +0200| [ab3fdaa7131e2fd8e33006daea25a282724c01f0] | committer: Anton Khirnov

yop: only set extradata size after it has been successfully allocated

Do not leave a non-zero extradata_size set on failure

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

 libavformat/yop.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/yop.c b/libavformat/yop.c
index 8caeb07..ea3175e 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -62,13 +62,12 @@ static int yop_read_header(AVFormatContext *s)
     video_stream = avformat_new_stream(s, NULL);
 
     // Extra data that will be passed to the decoder
-    video_stream->codec->extradata_size = 8;
 
-    video_stream->codec->extradata = av_mallocz(video_stream->codec->extradata_size +
-                                                FF_INPUT_BUFFER_PADDING_SIZE);
+    video_stream->codec->extradata = av_mallocz(8 + FF_INPUT_BUFFER_PADDING_SIZE);
 
     if (!video_stream->codec->extradata)
         return AVERROR(ENOMEM);
+    video_stream->codec->extradata_size = 8;
 
     // Audio
     audio_dec               = audio_stream->codec;



More information about the ffmpeg-cvslog mailing list