libavutil/audio_fifo.h · 3aaff803489af21011b8cf03847e17b29643c922 · libremedia / Tethys / FFmpeg

10 years ago

Michael Niedermayer authored 10 years ago


* commit 'a7985cfd':
  audio_fifo: Split into a separate doxygen module

Conflicts:
	libavutil/audio_fifo.h

See: 689e0280
Merged-by: Michael Niedermayer <michaelni@gmx.at>

705eb5a1

History

Merge commit ''

Michael Niedermayer authored 10 years ago


* commit 'a7985cfd':
  audio_fifo: Split into a separate doxygen module

Conflicts:
	libavutil/audio_fifo.h

See: 689e0280
Merged-by: Michael Niedermayer <michaelni@gmx.at>