[FFmpeg-cvslog] Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 15:22:37 2014 +0100| [add54280bfc101b842959e5fb96260cdb0882954] | committer: Michael Niedermayer

Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'

* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
  avcodec: Consistently name encoder init functions foo_encode_init

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

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