Age | Commit message (Collapse) | Author |
|
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
|
|
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
avconv: add support for Intel QSV-accelerated transcoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
|
|
Commit dbb03b8e47f905f0f7b10c3eb5ac11f9bfc793ff renamed loop to
stream_loop. This documents the change.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
|
|
* commit '16b0c929621f84983b83b9735ce973acb12723bc':
avconv: Add loop option.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
|
|
|
|
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>
|
|
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
Fixes Ticket227
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
Ancient and misleading.
Signed-off-by: Lou Logan <lou@lrcd.com>
|
|
Previous version reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* 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>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Partially fixes #3869.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
The examples used to drop frames in most cases which
was probably not what users expected.
|
|
|
|
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
|
|
|
|
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>
|
|
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
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>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
-framerate.
|
|
Signed-off-by: Lou Logan <lou@lrcd.com>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '481a3667495425db9fdffb653292b6460fb68208':
cmdutils: allow matching by metadata in stream specifiers
Conflicts:
Changelog
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Also lowercase "options" in "Advanced Video Options" for consistency.
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Lou Logan <lou@lrcd.com>
|
|
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '006c253346d90f4abaf69d78083c8ba031628598':
doc: Fit the graph in 80 cols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* 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>
|
|
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
These charts in man page are currently destroyed.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
timestamp options
Avoid doc duplication and desynching.
|
|
|
|
|
|
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* 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>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
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>
|
|
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
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>
|
|
* 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>
|