[FFmpeg-cvslog] Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 13:38:17 2013 +0100| [6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa] | committer: Michael Niedermayer

Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'

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

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

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