Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 20:08:47 +0000 (21:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 20:09:42 +0000 (21:09 +0100)
commita3b9f53d7b2faa0d60fa2308351c5aef3381630f
tree18d424501c153aae0fa07ae1e4ccc67874d1f163
parentd43d627a24dba944c3c6bf08146ad4945c2bc9b3
parent7dc827b7091b1ca85508b536fa776b49f363b0f4
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@gmx.at>
libavcodec/dcadec.c