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/multithreading.txt | |
| parent | 0fecf2642b9d909820683647c70031a954f5e58d (diff) | |
Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4.
Conflicts:
doc/optimization.txt
Diffstat (limited to 'doc/multithreading.txt')
| -rw-r--r-- | doc/multithreading.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/multithreading.txt b/doc/multithreading.txt index b72bc16079..a1068425cd 100644 --- a/doc/multithreading.txt +++ b/doc/multithreading.txt @@ -1,7 +1,7 @@ -Libav multithreading methods +FFmpeg multithreading methods ============================================== -Libav provides two methods for multithreading codecs. +FFmpeg provides two methods for multithreading codecs. Slice threading decodes multiple parts of a frame at the same time, using AVCodecContext execute() and execute2(). |