]> git.sesse.net Git - ffmpeg/commit
Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 23:29:42 +0000 (01:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 23:45:22 +0000 (01:45 +0200)
commit91b4ed09180c358f950ccbed4d3774178357add6
treefa9c8675d5d001e1092c0f425093c5d96979c782
parent8dfb8190d768f5ea5924f06a59fffa9fa5f8308b
parenta1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812
Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'

* commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812':
  cdgraphics: switch to bytestream2

Conflicts:
libavcodec/cdgraphics.c

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