virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
93,465 Commits 37 Branches 400 Tags 460 MiB
ec1e4a8baf
Commit Graph

237 Commits

Author SHA1 Message Date
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