Merge commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:40:48 +0000 (18:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:41:07 +0000 (18:41 +0200)
commit3301b248b0338ca53ad24ae77677bd733ed9d063
treeda1291d01d550fb8238e5550dc6b616d752df5a8
parent7b67ce9ade01abcf0d5d08ada62011b43526a646
parent5bf5a35fb5d452ea4b30cd7b853d92df6705d250
Merge commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250' into release/2.2

* commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250':
  cdgraphics: switch to bytestream2

Conflicts:
libavcodec/cdgraphics.c

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