[FFmpeg-cvslog] Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 13:55:37 2013 +0100| [1fd323f31e535fc533bb50486fe9d794969b630b] | committer: Michael Niedermayer

Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'

* commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5':
  ljpegenc: split bgr encoding into a separate function

Conflicts:
	libavcodec/ljpegenc.c

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

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