Merge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:25:32 +0000 (18:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:25:32 +0000 (18:25 +0200)
commita457115f0f09b1868aa4c3a0eeca2e1b3f0dd78b
tree7def240343e626091023293c6a833baea89eb4b9
parent90241187ceb6f3aa34e2783d0b69c3781af4026f
parent3aebdffb010df025728d6c2af89642f9634aa806
Merge commit '3aebdffb010df025728d6c2af89642f9634aa806' into release/0.10

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

Conflicts:
libavcodec/cdgraphics.c

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