Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 10:09:09 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 10:09:32 +0000 (12:09 +0200)
commita6fd685fedb1e9f66f9fb2ffdbb7f506e17cf225
tree6fd5ef307c569ecdf9669f45ec86a393a889b0e9
parent303fc9b368330aeea3d0be492e895c26eb82a286
parentd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d
Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h