diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:55:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:55:37 +0100 |
| commit | 1fd323f31e535fc533bb50486fe9d794969b630b (patch) | |
| tree | a71c97eb38ff1f39e897f909189fd0d317d3b2b8 /libavcodec/vima.c | |
| parent | fb98ca575d64452dba55a60c4ddf571163f0ca81 (diff) | |
| parent | fa4476815d0d27996eb199452f2cdbfccdd244a5 (diff) | |
| download | ffmpeg-1fd323f31e535fc533bb50486fe9d794969b630b.tar.gz | |
Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'
* commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5':
ljpegenc: split bgr encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vima.c')
0 files changed, 0 insertions, 0 deletions