Changeset 26f6acc6 in ffmpeg

Timestamp:

Jul 3, 2013, 10:16:24 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

57bc64e2

Parents:

b0448e51 (diff), 5efadcb8 (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 '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'

• commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4': jpeg2000: Clean up return paths and error messages

Conflicts:

libavcodec/jpeg2000dec.c

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

(No files)