Commit 52ea7ffd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd69243d3'

* commit 'd69243d3':
  samplefmt: Add doxygen categories

Conflicts:
	libavutil/samplefmt.h

See: b27555a3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 28c03195 d69243d3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment