diff mbox

[FFmpeg-devel,1/8] doc/muxers: fix order of options and examples for image2 muxer

Message ID 20191227211411.30293-1-cus@passwd.hu
State New
Headers show

Commit Message

Marton Balint Dec. 27, 2019, 9:14 p.m. UTC 
Signed-off-by: Marton Balint <cus@passwd.hu>
---
 doc/muxers.texi | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Comments

Lou Logan Dec. 27, 2019, 9:43 p.m. UTC | #1 
On Fri, Dec 27, 2019, at 12:14 PM, Marton Balint wrote:
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
>  doc/muxers.texi | 52 ++++++++++++++++++++++++++--------------------------
>  1 file changed, 26 insertions(+), 26 deletions(-)

LGTM
Marton Balint Jan. 3, 2020, 5:12 p.m. UTC | #2 
On Fri, 27 Dec 2019, Lou Logan wrote:

> On Fri, Dec 27, 2019, at 12:14 PM, Marton Balint wrote:
>> Signed-off-by: Marton Balint <cus@passwd.hu>
>> ---
>>  doc/muxers.texi | 52 ++++++++++++++++++++++++++--------------------------
>>  1 file changed, 26 insertions(+), 26 deletions(-)
>
> LGTM

Thanks, applied, as well as patches 1-7 in the series. The last one is 
still pending discussion.

Thanks,
Marton
diff mbox

Patch

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 5d7ff1ab3b..fb5c9bc4c0 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -1169,6 +1169,32 @@  The pattern "img%%-%d.jpg" will specify a sequence of filenames of the
 form @file{img%-1.jpg}, @file{img%-2.jpg}, ..., @file{img%-10.jpg},
 etc.
 
+The image muxer supports the .Y.U.V image file format. This format is
+special in that that each image frame consists of three files, for
+each of the YUV420P components. To read or write this image file format,
+specify the name of the '.Y' file. The muxer will automatically open the
+'.U' and '.V' files as required.
+
+@subsection Options
+
+@table @option
+@item frame_pts
+If set to 1, expand the filename with pts from pkt->pts.
+Default value is 0.
+
+@item start_number
+Start the sequence from the specified number. Default value is 1.
+
+@item update
+If set to 1, the filename will always be interpreted as just a
+filename, not a pattern, and the corresponding file will be continuously
+overwritten with new images. Default value is 0.
+
+@item strftime
+If set to 1, expand the filename with date and time information from
+@code{strftime()}. Default value is 0.
+@end table
+
 @subsection Examples
 
 The following example shows how to use @command{ffmpeg} for creating a
@@ -1209,32 +1235,6 @@  You can set the file name with current frame's PTS:
 ffmpeg -f v4l2 -r 1 -i /dev/video0 -copyts -f image2 -frame_pts true %d.jpg"
 @end example
 
-@subsection Options
-
-@table @option
-@item frame_pts
-If set to 1, expand the filename with pts from pkt->pts.
-Default value is 0.
-
-@item start_number
-Start the sequence from the specified number. Default value is 1.
-
-@item update
-If set to 1, the filename will always be interpreted as just a
-filename, not a pattern, and the corresponding file will be continuously
-overwritten with new images. Default value is 0.
-
-@item strftime
-If set to 1, expand the filename with date and time information from
-@code{strftime()}. Default value is 0.
-@end table
-
-The image muxer supports the .Y.U.V image file format. This format is
-special in that that each image frame consists of three files, for
-each of the YUV420P components. To read or write this image file format,
-specify the name of the '.Y' file. The muxer will automatically open the
-'.U' and '.V' files as required.
-
 @section matroska
 
 Matroska container muxer.