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
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
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
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
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
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
2014-03-30 21:20:58 +02:00
cc6cc84bc4
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
...
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98
2014-02-24 09:15:46 +01:00
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
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
e9edf001d4
doc/ffmpeg: remove documentation for removed vlang/slang options
2014-01-08 09:47:53 +01:00
6b58488f92
doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver
2013-11-27 15:48:19 +01:00
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
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
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
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
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
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
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
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
e9be4675b8
doc/ffmpeg: document -override_ffserver
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 22:19:10 +02:00
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
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
b1cc12d0e3
ffmpeg: make -aspect work with -vcodec copy.
2013-04-18 22:59:54 +02:00
Timothy Gu
Ganesh Ajjanagadde
Michael Niedermayer
Lou Logan
Michael Niedermayer
wm4
Giorgio Vazzana
Carl Eugen Hoyos
Nicolas George
Werner Robitza
Simon Thelen
Rodger Combs
Clément Bœsch
Stefano Sabatini
Bryce W. Harrington
Nicolas George