Skip to content
Snippets Groups Projects
Commit 52ea7ffd authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'd69243d3' 


* commit 'd69243d3':
  samplefmt: Add doxygen categories

Conflicts:
	libavutil/samplefmt.h

See: b27555a3
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 28c03195 d69243d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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