1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-21 16:47:28 +02:00

Revert "replace FFmpeg with Libav in doc/"

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
+2 -2
View File
@@ -122,11 +122,11 @@ with name "STREAM".
@settitle FFprobe media prober
@c man begin SEEALSO
ffmpeg(1), ffplay(1), ffserver(1) and the Libav HTML documentation
ffmpeg(1), ffplay(1), ffserver(1) and the FFmpeg HTML documentation
@c man end
@c man begin AUTHORS
The Libav developers
The FFmpeg developers
@c man end
@end ignore