On Sun, Oct 13, 2024 at 03:18:49PM +0200, Soma Lucz wrote: > -disposition: > Clarify the meaning of the default value, and how the '+' and '-' > prefixes work. Add more examples. > > -stats: > Clarify that it appears as an "info"-level log. > > -progress: > Add info about the "progress" key's value being "continue" or "end". > Add an example of logging to stdout. > > Signed-off-by: Soma Lucz <luczs...@gmail.com> > --- > doc/ffmpeg.texi | 58 +++++++++++++++++++++++++++++++++++++------------ > 1 file changed, 44 insertions(+), 14 deletions(-) > > diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi > index d11fe7c8f4..8cb48dfdf0 100644 > --- a/doc/ffmpeg.texi > +++ b/doc/ffmpeg.texi > @@ -921,24 +921,25 @@ ffmpeg -i INPUT -metadata:s:a:0 language=eng OUTPUT > @end example > > @item -disposition[:stream_specifier] @var{value} (@emph{output,per-stream}) > -Sets the disposition for a stream. > +Sets the disposition flags for a stream.
the patch lost the first column of whitespace Applying: doc/ffmpeg: improve -disposition, -stats, and -progress documentation error: corrupt patch at line 10 error: could not build fake ancestor Patch failed at 0001 doc/ffmpeg: improve -disposition, -stats, and -progress documentation hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false" [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB What is kyc? Its a tool that makes you give out your real ID, while criminals give out a forged ID card.
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".