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)
commitc11b3010c21a194a9e8da7f07c918ce1276e3d10
tree87dbd686d1d29edb3361cc22bbc8c5d624a4cf08
parent3301b248b0338ca53ad24ae77677bd733ed9d063
parent18f48e05a22a73a389fb3ab4b3eaf78903bab5ef
Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2

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

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