diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 14:01:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 14:01:54 +0100 |
| commit | 711c664a0e491a859d951f0d98807ec4327da283 (patch) | |
| tree | 54ca84955b1c9b7443224e10e8c44f712d4cb4b1 /libavcodec/mp3_header_decompress_bsf.c | |
| parent | 1fd323f31e535fc533bb50486fe9d794969b630b (diff) | |
| parent | b73a8922d818c7f909855557718d4c3bfacbd92d (diff) | |
| download | ffmpeg-711c664a0e491a859d951f0d98807ec4327da283.tar.gz | |
Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'
* commit 'b73a8922d818c7f909855557718d4c3bfacbd92d':
ljpegenc: split yuv encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mp3_header_decompress_bsf.c')
0 files changed, 0 insertions, 0 deletions