-
Michael Niedermayer authored
* commit 'b73a8922': ljpegenc: split yuv encoding into a separate function Conflicts: libavcodec/ljpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
711c664a
* commit 'b73a8922': ljpegenc: split yuv encoding into a separate function Conflicts: libavcodec/ljpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>