Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:38:17 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:38:30 +0000 (13:38 +0100)
commit6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa
tree89f09141b8aaa2d6797343562a01d6edccc82228
parent6deaab360c9c79e686265c99b9f9afc1d0068a8f
parent0cdbc4d39394965bd8712395b19160da8f3fe144
Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'

* commit '0cdbc4d39394965bd8712395b19160da8f3fe144':
  ljpegenc: rename the encoding function.

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