Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:25:56 +0000 (04:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:25:56 +0000 (04:25 +0100)
commitb22c16daafdf314a102b7f9d3810246cb45c2363
treea740d6ed3be1f0a56ce581d8471863df2f5ebc29
parentfb06b8ba9371495d051d2fd815a21fb1c1392b73
parenta1ba1f20b350cb89e645f17bdb237d027170db33
Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'

* commit 'a1ba1f20b350cb89e645f17bdb237d027170db33':
  mjpegenc: cosmetics, reformat jpeg_put_comments()

Conflicts:
libavcodec/mjpegenc.c

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