Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:55:37 +0000 (13:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:55:37 +0000 (13:55 +0100)
commit1fd323f31e535fc533bb50486fe9d794969b630b
treea71c97eb38ff1f39e897f909189fd0d317d3b2b8
parentfb98ca575d64452dba55a60c4ddf571163f0ca81
parentfa4476815d0d27996eb199452f2cdbfccdd244a5
Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'

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

Conflicts:
libavcodec/ljpegenc.c

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