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)
commit3bf81d389638199ebdbe8f2d302b4c2a7f6563d2
tree86e0c5500a1f4a41c1304d71d47b766165bf0444
parent53d2b69b72b0bac919f3083298d3ad914ea86735
parent85ca012ba680bdf942d95ab98c74f6a28f447588
Merge commit '85ca012ba680bdf942d95ab98c74f6a28f447588'

* commit '85ca012ba680bdf942d95ab98c74f6a28f447588':
  mjpegenc: Fix JFIF header byte ordering

Conflicts:
libavcodec/mjpegenc_common.c

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