[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  9 15:46:31 2014 +0100| [cab5315519ff8172f3b07dbcc4d4829ae567b1a9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cab5315519ff8172f3b07dbcc4d4829ae567b1a9
---