-
Michael Niedermayer authored
* commit 'a1ba1f20': mjpegenc: cosmetics, reformat jpeg_put_comments() Conflicts: libavcodec/mjpegenc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
b22c16da
* commit 'a1ba1f20': mjpegenc: cosmetics, reformat jpeg_put_comments() Conflicts: libavcodec/mjpegenc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>