Merge commit '5549f693d2181b3211427f65e48eaa2f4fc5a402' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 20:01:43 +0000 (22:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 20:01:58 +0000 (22:01 +0200)
* commit '5549f693d2181b3211427f65e48eaa2f4fc5a402':
  mjpegenc: Fix JFIF header byte ordering

Conflicts:
libavcodec/mjpegenc_common.c

See: b19313218c32fa9446d474cbddb11c0776868cd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mjpegenc_common.c

Simple merge