diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 10:30:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 10:31:08 +0100 |
| commit | 715f3623f8cd16c9e8d704bad45b76aa30d31cd2 (patch) | |
| tree | d69db24220cb75d3e77561453e0c21cf8ff783a2 /presets/libvpx-1080p50_60.ffpreset | |
| parent | 3aaa50a9972c9f350ad9ce6decf3ecb2aaffa84a (diff) | |
| parent | 10421bcf0ab5d48fa3d84de803e657b77fe7d3c0 (diff) | |
| download | ffmpeg-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 'presets/libvpx-1080p50_60.ffpreset')
0 files changed, 0 insertions, 0 deletions