Changeset 1abb875c in ffmpeg

Timestamp:

Jul 3, 2013, 2:11:01 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

19ff6f55

Parents:

ee7da5ba (diff), daeb4e30 (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 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'

• commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788': jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:

libavcodec/jpeg2000.c

See: 9d56ccf5

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

(No files)