[FFmpeg-cvslog] Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 20:38:35 2015 +0100| [e5b7e2224f62e9cb6697e664b7d1245302cca9e7] | committer: Michael Niedermayer

Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'

* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
  DNxHD: More verbose error messages

Conflicts:
	libavcodec/dnxhddec.c

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

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