Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 23:56:28 +0000 (01:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 23:56:50 +0000 (01:56 +0200)
commitc62862799575e720b02cf640429da598d43d8b07
treeb823add36516d87df605a3743ff5f432eee97a40
parent91b4ed09180c358f950ccbed4d3774178357add6
parentc7d9b473e28238d4a4ef1b7e8b42c1cca256da36
Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36'

* commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36':
  cdgraphics: do not return 0 from the decode function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cdgraphics.c