falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25' 

* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
	libavutil/samplefmt.h

See: b27555a3a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
28c0319517 d69243d39b
commit
52ea7ffdfb
Unified View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available