[FFmpeg-cvslog] Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 04:25:56 2013 +0100| [b22c16daafdf314a102b7f9d3810246cb45c2363] | committer: Michael Niedermayer

Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'

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

Conflicts:
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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