Michael Niedermayer 97511bc7cf Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9' ...

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

Conflicts:
	libavcodec/jpeg2000.c

See: 09927f3eaa
See: 912ce9dd20
See: 9e477a3770
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-06-24 01:45:42 +02:00

22 KiB

Raw Blame History

View Raw