Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 10:54:01 +0000 (12:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 10:54:01 +0000 (12:54 +0200)
commit57bc64e235fde80c8e543a6e7f9b4439c36633bb
tree79d2c03314e88ab6f7a107d1723ccbf8ad738b95
parent26f6acc66b668aa9cb97d487aa980a361d4030a1
parent1a3598aae768465a8efc8475b6df5a8261bc62fc
Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'

* commit '1a3598aae768465a8efc8475b6df5a8261bc62fc':
  jpeg2000: Use bytestream2

Conflicts:
libavcodec/jpeg2000dec.c

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