[FFmpeg-devel] [PATCH 1/2] lavf/mpenenc: extend options definition

[FFmpeg-devel] [PATCH 1/2] lavf/mpenenc: extend options definition

[Stefano Sabatini]

---
 libavformat/mpegenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 12d9fb33ec..14caf9e162 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1291,8 +1291,8 @@ static void mpeg_mux_deinit(AVFormatContext *ctx)
 #define OFFSET(x) offsetof(MpegMuxContext, x)
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-    { "muxrate", NULL,                                          OFFSET(user_mux_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, ((1<<22) - 1) * (8 * 50), E },
-    { "preload", "Initial demux-decode delay in microseconds.", OFFSET(preload),  AV_OPT_TYPE_INT, { .i64 = 500000 }, 0, INT_MAX, E },
+    { "muxrate", "mux rate as bits/s", OFFSET(user_mux_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, ((1<<22) - 1) * (8 * 50), E },
+    { "preload", "initial demux-decode delay in microseconds", OFFSET(preload),  AV_OPT_TYPE_INT, { .i64 = 500000 }, 0, INT_MAX, E },
     { NULL },
 };
 
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] doc/muxers: add MPEG-1/2 muxers section

[Stefano Sabatini]

---
 doc/muxers.texi | 66 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index a8bc642c00..c7951e1c33 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -578,6 +578,72 @@ ffmpeg -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe
 @end example
 @end itemize
 
+@section MPEG-1/MPEG-2 program stream muxers
+
+This section covers formats belonging to the MPEG-1 and MPEG-2 Systems
+family.
+
+The MPEG-1 Systems format (also known as ISO/IEEC 11172-1 or MPEG-1
+program stream) has been adopted for the format of media track stored
+in VCD (Video Compact Disc).
+
+The MPEG-2 Systems standard (also known as ISO/IEEC 13818-1) covers
+two containers formats, one known as transport stream and one known as
+program stream; only the latter is covered here.
+
+The MPEG-2 program stream format (also known as VOB due to the
+corresponding file extension) is an extension of MPEG-1 program
+stream: in addition to support different codecs for the audio and
+video streams, it also stores subtitles and navigation metadata.
+MPEG-2 program stream has been adopted for storing media streams in
+SVCD and DVD storage devices.
+
+This section comprises the following muxers.
+
+@table @samp
+@item mpeg (mpg,mpeg)
+MPEG-1 Systems / MPEG program stream muxer.
+
+@item vcd
+MPEG-1 Systems / MPEG program stream (VCD) muxer.
+
+This muxer can be used to generate tracks in the format accepted by
+the VCD (Video Compact Disc) storage devices.
+
+It is the same as the @samp{mpeg} muxer with a few differences.
+
+@item vob
+MPEG-2 program stream (VOB) muxer.
+
+@item dvd
+MPEG-2 program stream (DVD VOB) muxer.
+
+This muxer can be used to generate tracks in the format accepted by
+the DVD (Digital Versatile Disc) storage devices.
+
+This is the same as the @samp{vob} muxer with a few differences.
+
+@item svcd (vob)
+MPEG-2 program stream (SVCD VOB) muxer.
+
+This muxer can be used to generate tracks in the format accepted by
+the SVCD (Super Video Compact Disc) storage devices.
+
+This is the same as the @samp{vob} muxer with a few differences.
+@end table
+
+@subsection Options
+@table @option
+@item preload @var{delay}
+Set initial demux-decode delay in microseconds. Default value is
+@code{500000}.
+
+@item muxrate @var{rate}
+Set user-defined mux rate expressed as a number of bits/s. If not
+specied the automatically computed mux rate is employed. Default value
+is @code{0}.
+@end table
+
 @anchor{a64}
 @section a64
 A64 Commodore 64 video muxer.
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] lavf/mpenenc: extend options definition

[Anton Khirnov]

>Subject: Re: [FFmpeg-devel] [PATCH 1/2] lavf/mpenenc: extend options definition
                                                 ^
                                               typo

-- 
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".