Changeset 19ff6f55 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5eb23e6b

Parents:

1abb875c (diff), d57c737a (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (07/03/13 14:22:11)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/03/13 14:26:01)

Message:

Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'

• commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9': jpeg2000: Simplify jpeg2000_decode_packets() jpeg2000: Do not crash on NULL node in tag_tree_decode jpeg2000: Refactor SOT marker parsing

Conflicts:

libavcodec/jpeg2000dec.c

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

(No files)