Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:49:37 +0000 (18:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:49:37 +0000 (18:49 +0200)
* commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef':
  cdgraphics: do not return 0 from the decode function

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

Simple merge