diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 14:04:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 14:04:50 +0100 |
| commit | 9336a980bb2608089ad34cbf605fbb5ed9bca677 (patch) | |
| tree | 6f94f20b462758e9c43598cb8c100f381bfde4dc /presets/libx264-ipod640.ffpreset | |
| parent | 8e4e532bb28ef8713145ec85aafac3b3fe2775e3 (diff) | |
| parent | c1ea44c54d837a69d8285601cfba7aa8df16e053 (diff) | |
| download | ffmpeg-9336a980bb2608089ad34cbf605fbb5ed9bca677.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add support for limelight authentication
rtmp: Add support for adobe authentication
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libx264-ipod640.ffpreset')
0 files changed, 0 insertions, 0 deletions