[FFmpeg-cvslog] Merge commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 15:45:19 2014 +0200| [420f63984b39dbc847295126ee2e701df068dd53] | committer: Michael Niedermayer

Merge commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83' into release/1.1

* commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83':
  cdgraphics: switch to bytestream2

Conflicts:
	libavcodec/cdgraphics.c

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

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