Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'

* commit '03eb55741427c6608f63972c105e565ca0ba4f15': wmv2enc: Check memory allocation Conflicts: libavcodec/wmv2enc.c See: 6e8fe44 Merged-by: Michael Niedermayer <[email protected]>
SaschaVasarrhelyi · Jul 27, 2015 · 59b0094 · 59b0094
2 parents c707437 + 03eb557
commit 59b0094
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
@@ -65,6 +65,7 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx)
     avctx->extradata      = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
     if (!avctx->extradata)
         return AVERROR(ENOMEM);
+
     encode_ext_header(w);
 
     return 0;