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)
* commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36':
  cdgraphics: do not return 0 from the decode function

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

Simple merge