Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 14:46:31 +0000 (15:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 14:46:31 +0000 (15:46 +0100)
commitcab5315519ff8172f3b07dbcc4d4829ae567b1a9
tree581de8554c6b51196f7b8a06805bb6a0af9e4e93
parentc1362ca0479eedc6171306276f6ed4baa7e9882f
parentd48132b7de7601c8c2769c0e92a43baa7759b991
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>
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h