diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:55:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:26:45 +0100 |
| commit | a6be21d3baf09be1e22648e4802b955191d26b67 (patch) | |
| tree | 6762797c6fa93501e2a275340aa8739f0c32e7c6 /doc/optimization.txt | |
| parent | 0fecf2642b9d909820683647c70031a954f5e58d (diff) | |
| download | ffmpeg-a6be21d3baf09be1e22648e4802b955191d26b67.tar.gz | |
Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4.
Conflicts:
doc/optimization.txt
Diffstat (limited to 'doc/optimization.txt')
| -rw-r--r-- | doc/optimization.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/optimization.txt b/doc/optimization.txt index 70df5f06d5..08954f9973 100644 --- a/doc/optimization.txt +++ b/doc/optimization.txt @@ -201,7 +201,7 @@ Inline asm vs. external asm --------------------------- Both inline asm (__asm__("..") in a .c file, handled by a compiler such as gcc) and external asm (.s or .asm files, handled by an assembler such as yasm/nasm) -are accepted in Libav. Which one to use differs per specific case. +are accepted in FFmpeg. Which one to use differs per specific case. - if your code is intended to be inlined in a C function, inline asm is always better, because external asm cannot be inlined |