[FFmpeg-cvslog] Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 01:29:42 2014 +0200| [91b4ed09180c358f950ccbed4d3774178357add6] | committer: Michael Niedermayer

Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'

* commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812':
  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=91b4ed09180c358f950ccbed4d3774178357add6
---