Imported Debian version 2.5.3~trusty1

[deb_ffmpeg.git] / ffmpeg / libavformat / utils.c

diff --git a/ffmpeg/libavformat/utils.c b/ffmpeg/libavformat/utils.c
index 5da110da66fd6304b86c663670fed83fb4e6b65f..5a282a7ce79b56767be2d4bb1bc1ea4d3576c1be 100644 (file)
--- a/ffmpeg/libavformat/utils.c
+++ b/ffmpeg/libavformat/utils.c
@@ -2829,6 +2829,7 @@ int ff_alloc_extradata(AVCodecContext *avctx, int size)
     int ret;
 
     if (size < 0 || size >= INT32_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
+        avctx->extradata = NULL;
         avctx->extradata_size = 0;
         return AVERROR(EINVAL);
     }