diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:30:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:30:05 +0200 |
| commit | 2328e7e865216acdad6c9ce8a8dae4664aff3a29 (patch) | |
| tree | b36393eb4db949bbda12bbee44e093d2fdbc73ad /libavcodec/gif.h | |
| parent | 11cf4b72475f70a35d78b04e3b21d295c2da8a1d (diff) | |
| parent | 5bf208f659703895df7926238dcfa8a8175de36b (diff) | |
| download | ffmpeg-2328e7e865216acdad6c9ce8a8dae4664aff3a29.tar.gz | |
Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'
* commit '5bf208f659703895df7926238dcfa8a8175de36b':
jpeg2000: Use separate fields for int and float codepaths
jpeg2000: Split int/float codepaths depending on the DWT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gif.h')
0 files changed, 0 insertions, 0 deletions