diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-07 00:32:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-07 00:33:09 +0200 |
| commit | 52ea7ffdfbfc46c6936963328f3311fd936f256b (patch) | |
| tree | bd080c4cded2d940113098761eb362b3cb71ca37 | |
| parent | 28c03195174719c6683ecd3c411eb35e5bb29a38 (diff) | |
| parent | d69243d39b773b64614792487cd93f6ceb237b25 (diff) | |
Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'
* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
samplefmt: Add doxygen categories
Conflicts:
libavutil/samplefmt.h
See: b27555a3a05f8a39c58ac98561411555da3f4a6f
Merged-by: Michael Niedermayer <[email protected]>
0 files changed, 0 insertions, 0 deletions