diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-14 01:50:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-14 01:53:11 +0200 |
| commit | 0db047cd0fcfcf507fd8a5b1cea883de15be0a23 (patch) | |
| tree | 9b2b6dd90e32423e874092dfa03b4cf273099fd9 /tests/ffserver.conf | |
| parent | 555e2921ddc48e84ce8890662c3b7fcd0594a45e (diff) | |
| parent | 7b089b79e6c9e2f36e3811a24f64f2e00e46786d (diff) | |
| download | ffmpeg-0db047cd0fcfcf507fd8a5b1cea883de15be0a23.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: fix link to fate.libav.org
Conflicts:
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions