Merge commit '03eb5574'

* commit '03eb5574':
  wmv2enc: Check memory allocation

Conflicts:
	libavcodec/wmv2enc.c

See: 6e8fe448Merged-by: Michael Niedermayer <michael@niedermayer.cc>

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;