aboutsummaryrefslogtreecommitdiffstats
path: root/compat/plan9/printf
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-27 10:30:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-27 10:31:08 +0100
commit715f3623f8cd16c9e8d704bad45b76aa30d31cd2 (patch)
treed69db24220cb75d3e77561453e0c21cf8ff783a2 /compat/plan9/printf
parent3aaa50a9972c9f350ad9ce6decf3ecb2aaffa84a (diff)
parent10421bcf0ab5d48fa3d84de803e657b77fe7d3c0 (diff)
downloadffmpeg-715f3623f8cd16c9e8d704bad45b76aa30d31cd2.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Add an audio transcoding example. Conflicts: configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/plan9/printf')
0 files changed, 0 insertions, 0 deletions