Moritz Barsnick
aab0885c19
doc/ffmpeg: remove reference to deprecated option
...
The "-deinterlace" was deprecated since d7edd35
, over eight years
ago.
Refer to deinterlacing filters instead.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
2020-06-09 17:53:41 +05:30
Marton Balint
efe7a59364
fftools/ffmpeg: add new abort_on flag which aborts if there is a stream which received no packets
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2020-05-26 21:50:50 +02:00
Lynne
3c5e5a5095
hwcontext_vulkan: let users enable device and instance extensions using options
...
Also documents all options supported by the hwdevice.
This lets users enable all extensions they need without writing their own
instance initialization code.
2020-05-10 23:20:47 +01:00
Mark Thompson
48b102c5a6
doc/ffmpeg: Document device selection for Vulkan
2020-02-09 20:36:45 +00:00
Gyan Doshi
fa677750de
doc/ffmpeg: document value source for -force_key_frames
...
Also clarify behaviour in case of specified timestamps
2020-01-05 10:53:46 +05:30
Lou Logan
419e5e7942
doc/ffmpeg: -timelimit is in user time
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-09-27 12:11:39 -08:00
Jun Zhao
e317c255f6
doc/ffmpeg: Document dts_error_threshold option
...
Document dts_error_threshold option.
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
2019-08-08 18:00:37 +08:00
Aman Gupta
9e40c97a84
doc/ffmpeg: muxdelay and muxpreload are output options
...
Signed-off-by: Aman Gupta <aman@tmm1.net>
2019-03-20 14:54:13 -07:00
Gyan Doshi
41ef6dd67d
doc/ffmpeg: remove entry for -loop_output
...
Option doesn't exist .. hasn't for a few years now.
2019-03-20 02:17:19 +05:30
Gyan Doshi
d15117c996
doc/ffmpeg: add entry for itsscale
2019-03-16 17:44:20 +05:30
Gyan Doshi
1087b792c3
doc/ffmpeg: clarify behaviour of -discard
...
Discarding all frames is universally supported as it happens in fftools
whereas selective discarding relies on the demuxer.
2019-01-04 15:47:33 +05:30
Gyan Doshi
d7ef10f16d
doc/ffmpeg: update entry for stream disable options
...
-vn/-an/-sn/-dn can now be used to block input streams from a file.
2019-01-04 15:21:00 +05:30
Gyan Doshi
9c12938ec5
ffmpeg: mark sseof as an input-only option
2018-06-09 00:37:03 +05:30
Gyan Doshi
e50a5c9c4e
doc/ffmpeg: rewrite Stream Selection chapter
...
Flesh out with details and examples to show quirks and limitations.
2018-06-02 20:16:12 +05:30
Gyan Doshi
04b570817b
doc/ffmpeg: remove non-existent vdt option
2018-06-01 01:23:12 +05:30
Gyan Doshi
cba167934b
doc/ffmpeg: update disposition values
...
Thumbnail example added. Avoid transcoding in older examples.
2018-05-29 11:57:58 +05:30
Gyan Doshi
96d7cbedbe
doc/ffmpeg - update benchmark option readout details
...
-benchmark and -benchmark_all now show real, system and user time
2018-04-28 22:51:04 +05:30
Lou Logan
d09368a408
doc/ffmpeg: document -dn option
...
Also mention -map in the -vn, -an, and -sn options.
Fixes #7036 .
Signed-off-by: Lou Logan <lou@lrcd.com>
2018-02-21 12:41:06 -09:00
Rostislav Pehlivanov
6b35a83214
Remove the ffserver program
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2018-01-06 18:31:37 +00:00
Mark Thompson
37c57df18e
doc/ffmpeg: Document opencl for -init_hw_device
2017-11-26 15:40:24 +00:00
Jim DeLaHunt
152902f379
doc: Add FAQs about running in background (rev 2)
...
Add two FAQs about running FFmpeg in the background.
The first explains the use of the -nostdin option in
a straightforward way. Text revised based on review.
The second FAQ starts from a confusing error message,
and leads to the solution, use of the -nostdin option.
The purpose of the second FAQ is to attract web searches
from people having the problem, and offer them a solution.
Add an anchor to the Main Options section of the ffmpeg
documentation, so that the FAQs can link directly there.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-22 18:13:49 +01:00
Vitaly _Vi Shukela
80ef3c8360
ffmpeg: Allow "-to" on input files in addition to "-t"
...
For some strange reason "-t" option was only implemented
for input files while both "-t" and "-to" were available
for use for output files. This made extracting a range from
input file inconvenient.
This patch enables -to option for input so one can do
ffmpeg -ss 1:23:20 -to 1:27:22.3 -i myinput.mkv ...
Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-19 04:38:29 +01:00
Michael Niedermayer
2c9fa4162b
ffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer and (de/en)coder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-23 12:41:04 +02:00
Clément Bœsch
2b32031827
lavc: drop VDA
...
Deprecated (aka removed) in OSX 10.11, and we have a replacement for it
(VideoToolbox).
2017-10-23 11:56:15 +02:00
Lou Logan
183fd30e0f
Fix several typos
...
"apix_fmts" found by Marc Péchaud.
"speedloss" found by Mikhail V.
Signed-off-by: Lou Logan <lou@lrcd.com>
2017-09-21 16:17:02 -08:00
pkviet
e0436ddaa4
ffmpeg options: Enable trailing ? for map_channel
...
The -map option allows for a trailing ? so that an error is not thrown if
the input stream does not exist.
This capability is extended to the map_channel option.
This allows a ffmpeg command not to break if an input channel does not
exist, which can be of use (for instance, scripts processing audio
channels with sources having unset number of audio channels).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-25 23:41:11 +02:00
Mark Thompson
7ce47090ce
ffmpeg: Support setting the hardware device to use when filtering
...
This only supports one device globally, but more can be used by
passing them with input streams in hw_frames_ctx or by deriving new
devices inside a filter graph with hwmap.
(cherry picked from commit e669db7610
)
2017-06-14 22:27:07 +01:00
Mark Thompson
527a1e2131
ffmpeg: Document the -init_hw_device option
...
(cherry picked from commit 303fadf596
)
2017-06-14 22:26:32 +01:00
erankor
2b06f2d2e2
ffmpeg: add enc_time_base option
...
add a per-stream option for setting the encoder timebase.
the following values are allowed:
0 - for video, use 1/frame_rate, for audio use 1/sample_rate (this is
the default)
-1 - match the input timebase (when possible)
>0 - set the timebase to provided number
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-10 14:00:20 +02:00
Clément Bœsch
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
Lou Logan
1c049d5ffe
doc/ffmpeg: document trailing "?" in map option
...
This feature was added in 2375a85c36
.
Signed-off-by: Lou Logan <lou@lrcd.com>
2017-02-13 15:26:43 -09:00
Mulvya
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
Sasi Inguva
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
Sasi Inguva
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
Michael Niedermayer
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
Simon Thelen
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
DeHackEd
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
Moritz Barsnick
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
Hendrik Leppkes
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
Carl Eugen Hoyos
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
Clément Bœsch
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
Umair Khan
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
Vittorio Gambaletta (VittGam)
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
Michael Niedermayer
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
Michael Niedermayer
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
Simon Thelen
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
Hendrik Leppkes
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
Marton Balint
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
Hendrik Leppkes
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
Ganesh Ajjanagadde
76cd82d925
doc/ffmpeg: use stream_loop instead of loop
...
Commit dbb03b8e47
renamed loop to
stream_loop. This documents the change.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-14 21:56:31 -04:00
Hendrik Leppkes
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
Timothy Gu
da0e76955a
ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels
2015-08-26 18:46:20 -07:00
Ganesh Ajjanagadde
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
Ganesh Ajjanagadde
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
Michael Niedermayer
42209eb955
doc/ffmpeg: Use @code
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29 18:58:40 +02:00
Michael Niedermayer
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
Lou Logan
dc52e6200d
doc/ffmpeg: remove tips
...
Ancient and misleading.
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-06-10 13:08:48 -08:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
wm4
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
Timothy Gu
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
Giorgio Vazzana
62e2fae8e4
ffmpeg: fix option name in documentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24 23:41:01 +01:00
Carl Eugen Hoyos
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
Nicolas George
508d6a23b4
ffmpeg: allow to set the thread message queue size.
2015-02-26 19:19:56 +01:00
Nicolas George
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
Michael Niedermayer
26db9d3b77
doc/ffmpeg: Document frame_drop_threshold
2015-02-10 15:10:56 -09:00
Werner Robitza
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
Simon Thelen
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
Lou Logan
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
Rodger Combs
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
Michael Niedermayer
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
Carl Eugen Hoyos
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
Lou Logan
d2163f5e28
doc/ffmpeg: fix metadata language example
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-08-20 10:44:22 -08:00
Michael Niedermayer
082d52354f
doc: fix toolname
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 01:00:49 +02:00
Michael Niedermayer
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
Clément Bœsch
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
Michael Niedermayer
01ef127bf8
ffmpeg: support setting AVStream.discard
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:26:22 +02:00
Lou Logan
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
Michael Niedermayer
5460ab73d2
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
...
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +02:00
Michael Niedermayer
c6eee3120a
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
...
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:22:22 +02:00
Michael Niedermayer
4169d8f601
doc/ffmpeg: restore ascii arrows in Simple filtergraphs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03 19:25:15 +02:00
Michael Niedermayer
0768fee964
Merge commit '006c253346d90f4abaf69d78083c8ba031628598'
...
* commit '006c253346d90f4abaf69d78083c8ba031628598':
doc: Fit the graph in 80 cols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03 19:25:03 +02:00
Michael Niedermayer
9c77e57393
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: make the ASCII flow charts narrower to fit onto TTY
Conflicts:
doc/ffmpeg.texi
See: 8fe1076094
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 21:20:58 +02:00
Michael Niedermayer
cc6cc84bc4
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
...
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 09:15:46 +01:00
Timothy Gu
8fe1076094
doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY
...
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-02-16 03:10:38 +01:00
Stefano Sabatini
433b153b68
doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options
...
Avoid doc duplication and desynching.
2014-01-24 12:20:46 +01:00
Stefano Sabatini
e9edf001d4
doc/ffmpeg: remove documentation for removed vlang/slang options
2014-01-08 09:47:53 +01:00
Stefano Sabatini
6b58488f92
doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver
2013-11-27 15:48:19 +01:00
Michael Niedermayer
3e641b4842
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
...
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +01:00
Michael Niedermayer
62e10c3759
Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
...
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
avconv: add infrastructure for using hwaccels
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:31:15 +01:00
Michael Niedermayer
74a8fe9483
doc/ffmpeg: document qscale and video stream special case
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 16:08:06 +01:00
Lou Logan
a06dcde507
doc: make x11grab examples consistent with option names
...
Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-14 23:08:52 +02:00
Timothy Gu
83165e39fe
doc: Rename avtools-common-opts to fftools-common opts
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 18:04:03 +02:00
Michael Niedermayer
99091ff217
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
...
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:49:47 +02:00
Bryce W. Harrington
d9c46c3cd9
doc: apply various grammar fixes
...
The first sentence of each of the modified man pages are worded a bit
awkwardly. These minor copy-edits should make them clearer.
Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-10 10:07:30 +02:00
Michael Niedermayer
7cbef2ed7e
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
...
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
avconv: make input -ss accurate when transcoding
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 11:39:09 +02:00
Michael Niedermayer
e9be4675b8
doc/ffmpeg: document -override_ffserver
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 22:19:10 +02:00
Michael Niedermayer
42f5fc716e
Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'
...
* commit '481575d255195c6c2f32e04686b94de984ae78d4':
avconv: remove -deinterlace
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg_opt.c
The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 12:07:56 +02:00
Stefano Sabatini
f40cf96ec0
doc: remove all-components.texi, include its content verbatim
...
Force re-generation of the manuals when an included file is modified.
The current dependency generation system is enable to track nested
inclusions.
The drawback is that the files will be generated even when there is no
strict need (for example if filters.texi is modified, ffmpeg.1 is
rebuilt), thus it trades a false negative with a false positive.
2013-04-25 11:19:53 +02:00