[FFmpeg-cvslog] Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 25 12:09:09 2014 +0200| [a6fd685fedb1e9f66f9fb2ffdbb7f506e17cf225] | committer: Michael Niedermayer

Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'

* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

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

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