[FFmpeg-cvslog] Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 15:47:30 2014 +0200| [06f7e87e15a6dd15a9fe0e1f0bfa9f72c8886475] | committer: Michael Niedermayer

Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06f7e87e15a6dd15a9fe0e1f0bfa9f72c8886475
---