mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'
* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
samplefmt: Add doxygen categories
Conflicts:
libavutil/samplefmt.h
See: b27555a3a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
52ea7ffdfb