Changeset 57bc64e2 in ffmpeg

Timestamp:

Jul 3, 2013, 10:54:01 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7c71ef4f

Parents:

26f6acc6 (diff), 1a3598aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'

• commit '1a3598aae768465a8efc8475b6df5a8261bc62fc': jpeg2000: Use bytestream2

Conflicts:

libavcodec/jpeg2000dec.c

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

(No files)