[FFmpeg-cvslog] doc/ffmpeg: restore location of stray passage

Gyan Doshi git at videolan.org
Sat Jan 23 12:16:28 EET 2021


ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Sat Jan 23 15:59:52 2021 +0530| [e8b46b2c73a89c3554a4335f1de9de71f5c37846] | committer: Gyan Doshi

doc/ffmpeg: restore location of stray passage

Added in 88fc1438c69, this passage was separated from its original
context over the years with unrelated entries sandwiched in between.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8b46b2c73a89c3554a4335f1de9de71f5c37846
---

 doc/ffmpeg.texi | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 470ce961ce..96f6737412 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1659,6 +1659,22 @@ graph will be added to the output file automatically, so we can simply write
 ffmpeg -i video.mkv -i image.png -filter_complex 'overlay' out.mkv
 @end example
 
+As a special exception, you can use a bitmap subtitle stream as input: it
+will be converted into a video with the same size as the largest video in
+the file, or 720x576 if no video is present. Note that this is an
+experimental and temporary solution. It will be removed once libavfilter has
+proper support for subtitles.
+
+For example, to hardcode subtitles on top of a DVB-T recording stored in
+MPEG-TS format, delaying the subtitles by 1 second:
+ at example
+ffmpeg -i input.ts -filter_complex \
+  '[#0x2ef] setpts=PTS+1/TB [sub] ; [#0x2d0] [sub] overlay' \
+  -sn -map '#0x2dc' output.mkv
+ at end example
+(0x2d0, 0x2dc and 0x2ef are the MPEG-TS PIDs of respectively the video,
+audio and subtitles streams; 0:0, 0:3 and 0:7 would have worked too)
+
 To generate 5 seconds of pure red video using lavfi @code{color} source:
 @example
 ffmpeg -filter_complex 'color=c=red' -t 5 out.mkv
@@ -1773,22 +1789,6 @@ On by default, to explicitly disable it you need to specify
 
 @end table
 
-As a special exception, you can use a bitmap subtitle stream as input: it
-will be converted into a video with the same size as the largest video in
-the file, or 720x576 if no video is present. Note that this is an
-experimental and temporary solution. It will be removed once libavfilter has
-proper support for subtitles.
-
-For example, to hardcode subtitles on top of a DVB-T recording stored in
-MPEG-TS format, delaying the subtitles by 1 second:
- at example
-ffmpeg -i input.ts -filter_complex \
-  '[#0x2ef] setpts=PTS+1/TB [sub] ; [#0x2d0] [sub] overlay' \
-  -sn -map '#0x2dc' output.mkv
- at end example
-(0x2d0, 0x2dc and 0x2ef are the MPEG-TS PIDs of respectively the video,
-audio and subtitles streams; 0:0, 0:3 and 0:7 would have worked too)
-
 @section Preset files
 A preset file contains a sequence of @var{option}=@var{value} pairs,
 one for each line, specifying a sequence of options which would be



More information about the ffmpeg-cvslog mailing list