diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 11:41:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 11:41:54 +0200 |
| commit | aecb3421f641d56d3b3419c28da5cf98b0eadd7c (patch) | |
| tree | 74aaefdd262d20a0b7a9d95d53c84ce88a726a59 /libavcodec/qpeg.c | |
| parent | fc37cd43338b8c8ad201c1e6013d402c1b51e917 (diff) | |
| parent | 45a1694fde251ee56e23aec073d73172c00aa470 (diff) | |
| download | ffmpeg-aecb3421f641d56d3b3419c28da5cf98b0eadd7c.tar.gz | |
Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'
* commit '45a1694fde251ee56e23aec073d73172c00aa470':
jpeg2000dec: cleanup properly after decoding errors
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qpeg.c')
0 files changed, 0 insertions, 0 deletions