Merge remote-tracking branch 'qatar/master'
* qatar/master:
mjpegdec: apply flipping after decoding, not before
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment