Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 13:47:30 +0000 (15:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 13:47:34 +0000 (15:47 +0200)
* commit '80c268eaaee402695a74d14acf76063100692a99':
  cdgraphics: do not return 0 from the decode function

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

Simple merge