Changeset 97511bc7 in ffmpeg

Timestamp:

Jun 23, 2014, 11:45:42 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

82e4340f

Parents:

faa1d4b1 (diff), 10306e9c (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> (06/23/14 23:21:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/23/14 23:45:42)

Message:

Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'

• commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9': jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:

libavcodec/jpeg2000.c

See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f
See: 912ce9dd2080c5837285a471d750fa311e09b555
See: 9e477a37703318cb86d8ed1d426929235aa02b67
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)