aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-07 00:55:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-07 00:55:52 +0200
commit705eb5a1774938ff6c3bd07af1d7574bf4016581 (patch)
tree290bb31b0c7b36402a8bd85e0e9889192de79717
parent52ea7ffdfbfc46c6936963328f3311fd936f256b (diff)
parenta7985cfd4c51b7fe2b870fc4ecd109707ee035d6 (diff)
downloadffmpeg-705eb5a1774938ff6c3bd07af1d7574bf4016581.tar.gz
Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'
* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6': audio_fifo: Split into a separate doxygen module Conflicts: libavutil/audio_fifo.h See: 689e02808d09bd0441ec199cb1a8953ac7c666f6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/audio_fifo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/audio_fifo.h b/libavutil/audio_fifo.h
index ca88de71d3..d21e6a1318 100644
--- a/libavutil/audio_fifo.h
+++ b/libavutil/audio_fifo.h
@@ -35,7 +35,7 @@
* @addtogroup lavu_audio
* @{
*
- * @defgroup lavu_audiofifo Audio First-In-First-Out Buffer
+ * @defgroup lavu_audiofifo Audio FIFO Buffer
* @{
*/