aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples/transcoding.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-07 00:32:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-07 00:33:09 +0200
commit52ea7ffdfbfc46c6936963328f3311fd936f256b (patch)
treebd080c4cded2d940113098761eb362b3cb71ca37 /doc/examples/transcoding.c
parent28c03195174719c6683ecd3c411eb35e5bb29a38 (diff)
parentd69243d39b773b64614792487cd93f6ceb237b25 (diff)
downloadffmpeg-52ea7ffdfbfc46c6936963328f3311fd936f256b.tar.gz
Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'
* commit 'd69243d39b773b64614792487cd93f6ceb237b25': samplefmt: Add doxygen categories Conflicts: libavutil/samplefmt.h See: b27555a3a05f8a39c58ac98561411555da3f4a6f Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/transcoding.c')
0 files changed, 0 insertions, 0 deletions