Merge commit '85ca012ba680bdf942d95ab98c74f6a28f447588'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:18:08 +0000 (22:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:19:05 +0000 (22:19 +0200)
* commit '85ca012ba680bdf942d95ab98c74f6a28f447588':
  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