[FFmpeg-cvslog] Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 23:34:36 2015 +0100| [d06dce21a454f541acec329aa5299e67cd9d0994] | committer: Michael Niedermayer

Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'

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

Conflicts:
	libavcodec/wmv2dec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d06dce21a454f541acec329aa5299e67cd9d0994
---