diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:45:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:45:03 +0200 |
| commit | ee7da5baccc3e038179c4072e9bab00b5689c1a9 (patch) | |
| tree | ca7e82effbf112f838e5bd959cccd0dbc67becd7 /libavcodec/jpeg2000.c | |
| parent | 44741113257b8f5e21f4676894d3ff9b9e5f99ac (diff) | |
| parent | 589e5b52f634f6b2d307a167a19eef7e7328cb08 (diff) | |
| download | ffmpeg-ee7da5baccc3e038179c4072e9bab00b5689c1a9.tar.gz | |
Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
* commit '589e5b52f634f6b2d307a167a19eef7e7328cb08':
jpeg2000: Use the correct sizeof in memset for T1 data
jpeg2000: Simplify init_tile()
jpeg2000: Update pixel format support
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
0 files changed, 0 insertions, 0 deletions