Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-27doc: Mention -dn in the "Stream selection" paragraph.Carl Eugen Hoyos
There is no "Data options" paragraph. Requested-by: ilker tezcan
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-02-01doc/ffmpeg: explain properly how -fs worksUmair Khan
Fix trac ticket #5160. Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-01-26ffmpeg_opt: Allow -metadata option to set metadata on programs.Vittorio Gambaletta (VittGam)
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-16ffmpeg: Allow specifying the program number for created programsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-12ffmpeg: Add basic support to mux multiple programsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-10doc/ffmpeg: Clarify that the sdp_file option requires an rtp output.Simon Thelen
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-29Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'Hendrik Leppkes
* commit 'cd0e08813a0484002b5defbf557c859f123953ae': avconv: support infinite loop for the loop option Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-15doc/ffmpeg: use stream_loop instead of loopGanesh Ajjanagadde
Commit dbb03b8e47f905f0f7b10c3eb5ac11f9bfc793ff renamed loop to stream_loop. This documents the change. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-14Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes
* commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-27ffmpeg_opt: Add -hwaccels option that lists all supported hwaccelsTimothy Gu
2015-08-12doc/ffmpeg,doc/ffplay: reference timespec definitionsGanesh Ajjanagadde
Reference time definition syntax in option descriptions when appropriate. Fixes trac ticket #4595. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-08-11doc/ffmpeg: correct minor typoGanesh Ajjanagadde
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29doc/ffmpeg: Use @codeMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer
Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-06-11doc/ffmpeg: remove tipsLou Logan
Ancient and misleading. Signed-off-by: Lou Logan <lou@lrcd.com>
2015-05-30doc/ffmpeg: Document xerrorMichael Niedermayer
Previous version reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21doc/ffmpeg: basic documentation for -copy/ignore_unknownMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2': avconv: Add an option for automatically rotating video according to display matrix Conflicts: Changelog ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20ffmpeg: add option not to offset seek position by start timewm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11Use @verbatim instead of @example for ASCII artsTimothy Gu
Partially fixes #3869. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-25ffmpeg: fix option name in documentationGiorgio Vazzana
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09doc: Improve video creation examples (from image2).Carl Eugen Hoyos
The examples used to drop frames in most cases which was probably not what users expected.
2015-02-26ffmpeg: allow to set the thread message queue size.Nicolas George
2015-02-19doc: set documentencoding on toplevel texi files.Nicolas George
Fix double UTF-8 encoding on output files. makeinfo / texi2any does not seem to provide a way of setting it globally for toplevel files.
2015-02-11doc/ffmpeg: Document frame_drop_thresholdMichael Niedermayer
2015-01-05doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove ↵Werner Robitza
superfluous example ffmpeg looks for both .ffpreset and .avpreset files depending on whether the -[avsf]pre or -pre option is used. Added two sections for each type of preset including the rules according to which files are searched. (Notably, the lookup order is swapped for avpreset files, because it first looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.) This removes the section explaining -pre only, which was under "Examples", where it did not really make sense. Signed-off-by: Werner Robitza <werner.robitza@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28doc/ffmpeg.texi: document the new -sdp_file optionSimon Thelen
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05doc: clarify -frames options behaviorLou Logan
Replace "frames to record" with "frames to output". The "to record" makes it seem like an input option, or that it would capture the frames instead of outputting them. Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Lou Logan <lou@lrcd.com>
2014-10-21doc/ffmpeg.texi: document the new -start_at_zero optionRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'Michael Niedermayer
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04': doc: Fix syntax and logical errors in avconv stream combination example Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24doc/ffmpeg: Try to clarify that the input option -r is not the same as ↵Carl Eugen Hoyos
-framerate.
2014-08-20doc/ffmpeg: fix metadata language exampleLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-08-14doc: fix toolnameMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14Merge commit '481a3667495425db9fdffb653292b6460fb68208'Michael Niedermayer
* commit '481a3667495425db9fdffb653292b6460fb68208': cmdutils: allow matching by metadata in stream specifiers Conflicts: Changelog cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30doc: remove trailing ':' at the end of sectionsClément Bœsch
Also lowercase "options" in "Advanced Video Options" for consistency.
2014-06-07ffmpeg: support setting AVStream.discardMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27doc/ffmpeg: note that -t is also an input optionLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-05-12Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer
* commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03doc/ffmpeg: restore ascii arrows in Simple filtergraphsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03Merge commit '006c253346d90f4abaf69d78083c8ba031628598'Michael Niedermayer
* commit '006c253346d90f4abaf69d78083c8ba031628598': doc: Fit the graph in 80 cols Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: make the ASCII flow charts narrower to fit onto TTY Conflicts: doc/ffmpeg.texi See: 8fe107609437909ddd2cf8f5690fe0158a0616f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTYTimothy Gu
These charts in man page are currently destroyed. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-24doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and ↵Stefano Sabatini
timestamp options Avoid doc duplication and desynching.
2014-01-08doc/ffmpeg: remove documentation for removed vlang/slang optionsStefano Sabatini
2013-11-27doc/ffmpeg: use @command{} for programs mentioned in -override_ffserverStefano Sabatini