| Message ID | 1592609351-31955-1-git-send-email-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Commit | 251434cb97ab9159bbcbad31f39c0fcbb9d1bdf5 |
| Headers | show |
| Series | [FFmpeg-devel] doc/encoders: fix the misleading usage of profile | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Sat, Jun 20, 2020 at 07:29:11AM +0800, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > users are getting mislead by the integer, although profile > can support both const string and integer. > http://ffmpeg.org/pipermail/ffmpeg-user/2020-June/049025.html > > Also fix the order of high and main, it's not my intention. > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > doc/encoders.texi | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/doc/encoders.texi b/doc/encoders.texi > index 1331b79..17a0f4c 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -2740,17 +2740,17 @@ MPEG-2 video encoder. > @subsection Options > > @table @option > -@item profile @var{integer} > +@item profile > Select the mpeg2 profile to encode: > > @table @samp > @item 422 > -@item main > +@item high > @item ss > Spatially Scalable > @item snr > SNR Scalable > -@item high > +@item main > @item simple > @end table > > -- > 1.8.3.1 > will apply.
On 20-06-2020 06:33 am, lance.lmwang@gmail.com wrote: > On Sat, Jun 20, 2020 at 07:29:11AM +0800, lance.lmwang@gmail.com wrote: >> From: Limin Wang <lance.lmwang@gmail.com> >> >> users are getting mislead by the integer, although profile >> can support both const string and integer. >> http://ffmpeg.org/pipermail/ffmpeg-user/2020-June/049025.html >> >> Also fix the order of high and main, it's not my intention. >> >> Signed-off-by: Limin Wang <lance.lmwang@gmail.com> >> --- >> doc/encoders.texi | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/doc/encoders.texi b/doc/encoders.texi >> index 1331b79..17a0f4c 100644 >> --- a/doc/encoders.texi >> +++ b/doc/encoders.texi >> @@ -2740,17 +2740,17 @@ MPEG-2 video encoder. >> @subsection Options >> >> @table @option >> -@item profile @var{integer} >> +@item profile >> Select the mpeg2 profile to encode: >> >> @table @samp >> @item 422 >> -@item main >> +@item high >> @item ss >> Spatially Scalable >> @item snr >> SNR Scalable >> -@item high >> +@item main >> @item simple >> @end table >> >> -- >> 1.8.3.1 >> > will apply. Patch is fine but next time wait to push changes to files you don't maintain. Gyan
On Sat, Jun 20, 2020 at 10:18:58AM +0530, Gyan Doshi wrote: > > On 20-06-2020 06:33 am, lance.lmwang@gmail.com wrote: > > On Sat, Jun 20, 2020 at 07:29:11AM +0800, lance.lmwang@gmail.com wrote: > > > From: Limin Wang <lance.lmwang@gmail.com> > > > > > > users are getting mislead by the integer, although profile > > > can support both const string and integer. > > > http://ffmpeg.org/pipermail/ffmpeg-user/2020-June/049025.html > > > > > > Also fix the order of high and main, it's not my intention. > > > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > > --- > > > doc/encoders.texi | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/doc/encoders.texi b/doc/encoders.texi > > > index 1331b79..17a0f4c 100644 > > > --- a/doc/encoders.texi > > > +++ b/doc/encoders.texi > > > @@ -2740,17 +2740,17 @@ MPEG-2 video encoder. > > > @subsection Options > > > @table @option > > > -@item profile @var{integer} > > > +@item profile > > > Select the mpeg2 profile to encode: > > > @table @samp > > > @item 422 > > > -@item main > > > +@item high > > > @item ss > > > Spatially Scalable > > > @item snr > > > SNR Scalable > > > -@item high > > > +@item main > > > @item simple > > > @end table > > > -- > > > 1.8.3.1 > > > > > will apply. > > Patch is fine but next time wait to push changes to files you don't > maintain. Sorry, my fault, I think it's been discussed in other thread clearly. > > Gyan > _______________________________________________ > 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".
diff --git a/doc/encoders.texi b/doc/encoders.texi index 1331b79..17a0f4c 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2740,17 +2740,17 @@ MPEG-2 video encoder. @subsection Options @table @option -@item profile @var{integer} +@item profile Select the mpeg2 profile to encode: @table @samp @item 422 -@item main +@item high @item ss Spatially Scalable @item snr SNR Scalable -@item high +@item main @item simple @end table