Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:37:59 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:38:22 +0000 (22:38 +0200)
commitebf381168af50021f1112a2564c9fe2c627e41d8
treeee5877faf048a650da5ebc4125453ebd75ce2742
parent0d901439729c073e79c3edae57ec0dff22fb64c5
parent74f6df745a05d3d8b3dcfc28992c69a70ae87957
Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2

* commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
libavcodec/jpeg2000.c

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