This repository has been archived by the owner on Jul 29, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ffmpeg_plugin: unbreak documentation patch after cc9b8bd
error: corrupt patch at line 169 error: patch failed: doc/general.texi:243 Signed-off-by: Jan Beich <[email protected]>
- Loading branch information
Showing
1 changed file
with
12 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,15 +10,15 @@ Signed-off-by: Zhengxu Huang <[email protected]> | |
Signed-off-by: Hassene Tmar <[email protected]> | ||
Signed-off-by: Jing Sun <[email protected]> | ||
--- | ||
doc/encoders.texi | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
doc/general.texi | 8 +++ | ||
2 files changed, 157 insertions(+) | ||
doc/encoders.texi | 152 ++++++++++++++++++++++++++++++++++++++ | ||
doc/general_contents.texi | 8 ++ | ||
2 files changed, 160 insertions(+) | ||
|
||
diff --git a/doc/encoders.texi b/doc/encoders.texi | ||
index eefd124..81debda 100644 | ||
index a92eb0eb2f..535e15764b 100644 | ||
--- a/doc/encoders.texi | ||
+++ b/doc/encoders.texi | ||
@@ -1640,6 +1640,155 @@ Set maximum NAL size in bytes. | ||
@@ -1884,6 +1884,158 @@ Set maximum NAL size in bytes. | ||
Allow skipping frames to hit the target bitrate if set to 1. | ||
@end table | ||
|
||
|
@@ -177,13 +177,13 @@ index eefd124..81debda 100644 | |
@section libtheora | ||
|
||
libtheora Theora encoder wrapper. | ||
diff --git a/doc/general.texi b/doc/general.texi | ||
index 3c0c803..fa9cd31 100644 | ||
--- a/doc/general.texi | ||
+++ b/doc/general.texi | ||
@@ -243,6 +243,14 @@ FFmpeg can use the OpenJPEG libraries for decoding/encoding J2K videos. Go to | ||
instructions. To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjpeg} to | ||
@file{./configure}. | ||
diff --git a/doc/general_contents.texi b/doc/general_contents.texi | ||
index 33ece6e884..cd46332fc4 100644 | ||
--- a/doc/general_contents.texi | ||
+++ b/doc/general_contents.texi | ||
@@ -267,6 +267,14 @@ Go to @url{https://github.com/OpenVisualCloud/SVT-AV1/} and follow the instructi | ||
for installing the library. Then pass @code{--enable-libsvtav1} to configure to | ||
enable it. | ||
|
||
+@section Scalable Video Technology for HEVC | ||
+ | ||
|