Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'

* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
  wmv2: Return meaningful error codes

Conflicts:
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/wmv2dec.c
index b1bcd09,d9869df..bb14d56
--- 1/libavcodec/wmv2dec.c
--- 2/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@@ -450,11 -459,10 +450,12 @@@ int ff_wmv2_decode_mb(MpegEncContext *s
  static av_cold int wmv2_decode_init(AVCodecContext *avctx)
  {
      Wmv2Context *const w = avctx->priv_data;
+     int ret;
  
-     if (ff_msmpeg4_decode_init(avctx) < 0)
-         return -1;
 +    avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
+     if ((ret = ff_msmpeg4_decode_init(avctx)) < 0)
+         return ret;
  
      ff_wmv2_common_init(w);