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)
* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

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

Simple merge