Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 13:01:54 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 13:01:54 +0000 (14:01 +0100)
commit711c664a0e491a859d951f0d98807ec4327da283
tree54ca84955b1c9b7443224e10e8c44f712d4cb4b1
parent1fd323f31e535fc533bb50486fe9d794969b630b
parentb73a8922d818c7f909855557718d4c3bfacbd92d
Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'

* commit 'b73a8922d818c7f909855557718d4c3bfacbd92d':
  ljpegenc: split yuv encoding into a separate function

Conflicts:
libavcodec/ljpegenc.c

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