Merge commit 'cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:47:20 +0000 (18:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:47:24 +0000 (18:47 +0200)
commit6596f5c3aa9add4600cb0f3c939fd639d89f6a70
tree42f11205476a61f5443565053265ae99a0f64e94
parenta457115f0f09b1868aa4c3a0eeca2e1b3f0dd78b
parentcf6b2a0ad2b06aabf04bec4c7b19e78a560cd904
Merge commit 'cf6b2a0ad2b06aabf04bec4c7b19e78a560cd904' into release/0.10

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

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