virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Revert "replace FFmpeg with Libav in doc/"

Browse Source 
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
This commit is contained in:
Michael Niedermayer
2011-03-17 16:55:58 +01:00
parent 0fecf2642b
commit a6be21d3ba
25 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ffserver.texi
View File

@@ -266,11 +266,11 @@ rather than as a daemon.
@c man begin SEEALSO
ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf}
example and the Libav HTML documentation
example and the FFmpeg HTML documentation
@c man end
@c man begin AUTHORS
The Libav developers
The FFmpeg developers
@c man end
@end ignore