Merge commit '85ca012b'
* commit '85ca012b': mjpegenc: Fix JFIF header byte ordering Conflicts: libavcodec/mjpegenc_common.c See: b1931321Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '85ca012b': mjpegenc: Fix JFIF header byte ordering Conflicts: libavcodec/mjpegenc_common.c See: b1931321Merged-by:Michael Niedermayer <michaelni@gmx.at>