[FFmpeg-cvslog] Merge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 18:25:32 2014 +0200| [a457115f0f09b1868aa4c3a0eeca2e1b3f0dd78b] | committer: Michael Niedermayer

Merge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10

* commit '3aebdffb010df025728d6c2af89642f9634aa806':
  cdgraphics: switch to bytestream2

Conflicts:
	libavcodec/cdgraphics.c

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

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