[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 21:08:47 2013 +0100| [a3b9f53d7b2faa0d60fa2308351c5aef3381630f] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: Add some logging before returning on error

Conflicts:
	libavcodec/dcadec.c

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

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