diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 11:43:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 11:43:26 +0200 |
| commit | 15677e72399d12911128e7109a7e4101226f48d6 (patch) | |
| tree | e9542130a2999d049af7489c838f47c0a025a0d5 /libavcodec/ljpegenc.c | |
| parent | ec0e0eb4c16f1ac1b0c0bb5fe34a34ebab0b3749 (diff) | |
| parent | e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa (diff) | |
| download | ffmpeg-15677e72399d12911128e7109a7e4101226f48d6.tar.gz | |
Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa'
* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
8bps: decode 24bit files correctly as rgb32 on bigendian
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ljpegenc.c')
0 files changed, 0 insertions, 0 deletions