Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 22:32:29 +0000 (00:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 22:33:09 +0000 (00:33 +0200)
commit52ea7ffdfbfc46c6936963328f3311fd936f256b
treebd080c4cded2d940113098761eb362b3cb71ca37
parent28c03195174719c6683ecd3c411eb35e5bb29a38
parentd69243d39b773b64614792487cd93f6ceb237b25
Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'

* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
libavutil/samplefmt.h

See: b27555a3a05f8a39c58ac98561411555da3f4a6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>