breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
a64333db5fefdec89533b6bec299fe169ef7d77d
FFmpeg/libavcodec/mjpegdec.h
Michael Niedermayer cab5315519 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>
2014-01-09 15:46:31 +01:00

4.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink