Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 18:42:09 +0000 (20:42 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 18:43:25 +0000 (20:43 +0200)
* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
  wmv2enc: Check memory allocation

Conflicts:
libavcodec/wmv2enc.c

See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/wmv2enc.c

@@@ -62,9 -62,10 +62,10 @@@ static av_cold int wmv2_encode_init(AVC
      ff_wmv2_common_init(w);
  
      avctx->extradata_size = 4;
 -    avctx->extradata      = av_mallocz(avctx->extradata_size + 10);
 +    avctx->extradata      = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
      if (!avctx->extradata)
          return AVERROR(ENOMEM);
      encode_ext_header(w);
  
      return 0;