71d541751e
Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'
...
* commit '043b0b9fb1481053b712d06d2c5b772f1845b72b':
Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v
The merge also includes all our own occurences.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 11:40:35 +01:00
1c049d5ffe
doc/ffmpeg: document trailing "?" in map option
...
This feature was added in 2375a85c36
2017-02-13 15:26:43 -09:00
40b6e28778
doc: Add muxers/demuxers list option
...
Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-11 02:59:32 +01:00
03e42a4fec
ffmpeg.c: Add output file index and stream index to vstats file.
...
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-27 22:16:37 +01:00
f227fc4c2a
ffmpeg_opt.c: Introduce a -vstats_version option and document the existing -vstats format.
...
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-25 22:03:10 +01:00
a5f27a9c3a
Avoid using the term "file" and prefer "url" in some docs and comments
...
This should make it less ambigous that these are URLs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-12-05 21:30:12 +01:00
cd5da01daa
doc/ffmpeg: add documentation for the disposition option
...
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-14 01:46:37 +01:00
6d50dff816
ffmpeg: parameters for filter thread counts
...
Enables specifying how many threads are available to each filtergraph.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-06 15:27:25 +01:00
99d68d462f
doc: fix various typos and grammar errors
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-10-11 16:57:46 +02:00
3e5e5bdfef
Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'
...
* commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc':
avconv: buffer the packets written while the muxer is not initialized
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-10-08 11:38:47 +02:00
dcc506a91e
doc: Mention -dn in the "Stream selection" paragraph.
...
There is no "Data options" paragraph.
Requested-by: ilker tezcan
2016-09-27 09:07:17 +02:00
8ef57a0d61
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
...
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 21:55:34 +02:00
9effa01255
doc/ffmpeg: explain properly how -fs works
...
Fix trac ticket #5160 .
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-02-01 14:00:14 +01:00
74658a8b4d
ffmpeg_opt: Allow -metadata option to set metadata on programs.
...
Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-26 17:36:08 +01:00
30d770ca44
ffmpeg: Allow specifying the program number for created programs
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-16 14:03:57 +01:00
8f948b6244
ffmpeg: Add basic support to mux multiple programs
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-11 22:27:25 +01:00
b02201efb5
doc/ffmpeg: Clarify that the sdp_file option requires an rtp output.
...
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-09 23:43:11 +01:00
9f7de99517
Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'
...
* commit 'cd0e08813a0484002b5defbf557c859f123953ae':
avconv: support infinite loop for the loop option
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-29 14:21:41 +01:00
ddc6bd8c95
ffmpeg: add abort_on option to allow aborting on empty output
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22 19:03:01 +02:00
dd8a4b0f8c
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
...
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
avconv: add support for Intel QSV-accelerated transcoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22 16:18:02 +02:00
76cd82d925
doc/ffmpeg: use stream_loop instead of loop
...
Commit dbb03b8e47
2015-10-14 21:56:31 -04:00
9ccd90626f
Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'
...
* commit '16b0c929621f84983b83b9735ce973acb12723bc':
avconv: Add loop option.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-14 14:28:20 +02:00
da0e76955a
ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels
2015-08-26 18:46:20 -07:00
8b63a88494
doc/ffmpeg,doc/ffplay: reference timespec definitions
...
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-12 11:52:40 +02:00
92a4bda95b
doc/ffmpeg: correct minor typo
...
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-11 14:39:23 +02:00
42209eb955
doc/ffmpeg: Use @code
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29 18:58:40 +02:00
f4ada6dc3f
ffmpeg: Implement support for seeking relative to EOF
...
Fixes Ticket227
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29 17:16:51 +02:00
dc52e6200d
doc/ffmpeg: remove tips
...
Ancient and misleading.
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-06-10 13:08:48 -08:00
161d0ac721
doc/ffmpeg: Document xerror
...
Previous version reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 19:32:05 +02:00
1c6ede3360
doc/ffmpeg: basic documentation for -copy/ignore_unknown
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21 22:32:24 +02:00
f5b26fbc2f
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
...
* 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-05-02 22:39:00 +02:00
bac7084fbd
ffmpeg: add option not to offset seek position by start time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 19:50:58 +02:00
3d6069d01c
Use @verbatim instead of @example for ASCII arts
...
Partially fixes #3869 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 01:14:51 +02:00
62e2fae8e4
ffmpeg: fix option name in documentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24 23:41:01 +01:00
4a94f7b22f
doc: Improve video creation examples (from image2).
...
The examples used to drop frames in most cases which
was probably not what users expected.
2015-03-09 10:49:59 +01:00
508d6a23b4
ffmpeg: allow to set the thread message queue size.
2015-02-26 19:19:56 +01:00
b491751409
doc: set documentencoding on toplevel texi files.
...
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-19 11:30:30 +01:00
26db9d3b77
doc/ffmpeg: Document frame_drop_threshold
2015-02-10 15:10:56 -09:00
beedeb4399
doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove 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>
2015-01-05 04:34:37 +01:00
750b10ff85
doc/ffmpeg.texi: document the new -sdp_file option
...
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 19:16:21 +01:00
37425fcb04
doc: clarify -frames options behavior
...
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-11-04 16:25:47 -09:00
1372c55786
doc/ffmpeg.texi: document the new -start_at_zero option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 13:38:44 +02:00
5e3da25618
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
...
* 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-09-11 01:27:38 +02:00
6f78c70324
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
2014-08-24 02:49:06 +02:00
d2163f5e28
doc/ffmpeg: fix metadata language example
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-08-20 10:44:22 -08:00
082d52354f
doc: fix toolname
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 01:00:49 +02:00
b8e4c11d93
Merge commit '481a3667495425db9fdffb653292b6460fb68208'
...
* commit '481a3667495425db9fdffb653292b6460fb68208':
cmdutils: allow matching by metadata in stream specifiers
Conflicts:
Changelog
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 00:41:21 +02:00
ec94c52e97
doc: remove trailing ':' at the end of sections
...
Also lowercase "options" in "Advanced Video Options" for consistency.
2014-06-30 15:36:26 +02:00
01ef127bf8
ffmpeg: support setting AVStream.discard
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:26:22 +02:00
5b1a56b34b
doc/ffmpeg: note that -t is also an input option
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-05-26 12:11:34 -08:00
Clément Bœsch
Lou Logan
Mulvya
Sasi Inguva
Michael Niedermayer
Simon Thelen
DeHackEd
Moritz Barsnick
Hendrik Leppkes
Carl Eugen Hoyos
Umair Khan
Vittorio Gambaletta (VittGam)
Marton Balint
Ganesh Ajjanagadde
Timothy Gu
Michael Niedermayer
wm4
Giorgio Vazzana
Nicolas George
Werner Robitza
Rodger Combs