[FFmpeg-cvslog] Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 12:54:01 2013 +0200| [57bc64e235fde80c8e543a6e7f9b4439c36633bb] | committer: Michael Niedermayer

Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'

* commit '1a3598aae768465a8efc8475b6df5a8261bc62fc':
  jpeg2000: Use bytestream2

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57bc64e235fde80c8e543a6e7f9b4439c36633bb
---