Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 22:55:36 +0000 (00:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 22:55:52 +0000 (00:55 +0200)
* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6':
  audio_fifo: Split into a separate doxygen module

Conflicts:
libavutil/audio_fifo.h

See: 689e02808d09bd0441ec199cb1a8953ac7c666f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/audio_fifo.h

Simple merge