virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
103,178 Commits 37 Branches 400 Tags 464 MiB
5ad436fcb9
Commit Graph

56 Commits

Author SHA1 Message Date
Thilo Borgmann
cf12a478b2 fftools/cmdutils.c: Add cmd line option to override detection of cpu count. 2021-07-16 10:06:23 +02:00
Gyan Doshi
c52ced7ca2 doc/fftools-common-opts: document max_alloc 2021-01-23 14:59:47 +05:30
Gyan Doshi
e73a8ecb38 doc/fftools-common-opts: document buildconf 2021-01-23 13:58:01 +05:30
Jun Zhao
b9ff25a93e doc/fftools-common-opts: document ffmpeg -h protocol=protocol_name 
document ffmpeg -h protocol=protocol_name

Reviewed-by: Gyan Doshi <ffmpeg@gyani.pro>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
 2020-08-08 15:06:45 +08:00
Jun Zhao
035208e514 doc/fftools-common-opts: fix typo (name => named) 
fix typo (name => named)

Reviewed-by: Gyan Doshi <ffmpeg@gyani.pro>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
 2020-08-08 15:05:31 +08:00
Marton Balint
2b496c90cd avutil/log: drop support for NO_COLOR environment variable 
Deprecated for more than 9 years now.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2020-02-09 20:31:44 +01:00
Nicolas George
e16cd7b86c doc/fftools-common-opts: small fix to -report documentation. 2020-01-20 17:05:53 +01:00
Jun Zhao
c432a91d25 doc/fftools-common-opts: document ffmpeg -h bsf=bitstream_filter_name 
document ffmpeg -h bsf=bitstream_filter_name

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
 2019-06-14 13:19:26 +08:00
Marton Balint
f9271d0158 avformat/utils: fix stream ordering for program ID stream specifiers 
Fixes a regression introduced in dbfd042983.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2019-05-24 21:39:07 +02:00
Gyan Doshi
cdf17cf92b doc: -report defaults to loglevel debug 2019-02-25 21:41:14 +05:30
Gyan Doshi
a9452fe6dc doc/fftools-common-opts: add example for codec option stream specifiers 2019-02-17 11:28:31 +05:30
Marton Balint
dbfd042983 avformat/utils: parse some stream specifiers recursively 
This removes lots of code duplication and also allows more complex specifiers,
for example you can use p:204:aⓂ️language:eng to select the English language
audio stream from program 204.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2019-02-13 23:21:53 +01:00
Bela Bodecs
3e1204b94d avformat/utils: Stream specifier enhancement 2. 
In some cases, mainly working with multiprogram mpeg-ts containers as
input, it would be handy to select sub stream of a specific program by
their metadata.
This patch makes it possible to narrow the stream selection among
streams of the specified program by stream metadata.

Examples:
p:601:m:language:hun  will select all sub streams of program with id 601
where sub streams have metadata key named 'language' with value 'hun'.
p:602:m:guide  will select all sub streams of program with id 602 where
sub streams have metadata key named 'guide'.

Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-04-13 21:44:28 +02:00
Bela Bodecs
37d0213968 avformat/utils: Stream specifier enhancement 
Currently when specifying the program id you can only decide to select
all stream of the specified program (e.g. p:103 will select all streams
of program 103) or narrow the selection to a specific stream sub index
(e.g. p:145:1 will select 2nd stream of program 145.) But you can not
specify like all audio streams of program 145 or 3rd video stream of
program 311.
In some case, mainly working with multiprogram mpeg-ts containers as
input, this feature would be handy.
This patch makes it possible to narrow the stream selection among
streams of the specified program by stream type and optionally its
index. Handled types: a, v, s, d.
Examples: p:601:a  will select all audio streams of program 601,
p:603:a:1 will select 2nd audio streams of program 603,
p:604:v:0 will select first video stream of program 604.

Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-04-12 23:52:59 +02:00
Tobias Rapp
bc62d20dc4 doc: update loglevel option documentation 
Updates documentation after the changes to loglevel flag prefix parsing
in 4b736bc921.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
 2018-04-12 08:44:03 +02:00
Mark Thompson
022ddff0b2 doc/fftools: Remove documentation for old -opencl_bench option 2017-11-26 15:40:24 +00:00
Mickael Maison
fdd4922dc4 doc/fftools-common-opts: Fixed a typo in the common arguments list 
- Fixed a typo for the -sources argument

Signed-off-by: Mickael Maison <mickael.maison@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-18 02:50:06 +02: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
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
Marton Balint
26a0cd1b4b lavf: add V as a video stream specifier which is not an attached picture 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-09-02 21:35:21 +02:00
Michael Niedermayer
8e8219e0f0 Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
  log: Introduce a more verbose debug level

Conflicts:
	doc/APIchanges
	doc/fftools-common-opts.texi
	libavutil/log.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 02:48:19 +02:00
James Almer
9fc45681e0 doc: add aarch64 cpuflags to fftools documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-10 20:57:19 -03:00
James Almer
666ec9bd09 doc: add missing arm cpuflags to fftools documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-10 20:57:15 -03:00
James Almer
410c93cfd5 doc: add missing x86 cpuflags to fftools documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-10 20:57:11 -03:00
Michael Niedermayer
50255b7a86 Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c' 
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
  cmdutils: Add a stream specifier to map usable streams

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-20 20:15:40 +01:00
Maneesh Gupta
1600f85cbc doc/fftools-common-opts: update/extend documentation for -opencl_bench option 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2015-01-28 10:00:30 +01:00
Lou Logan
10ef8f063b doc: add FFREPORT example 
And fix a few nits.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-12-12 16:51:16 -09:00
Lou Logan
55c5a38369 doc: add loglevel numerical values 
Useful for setting FFREPORT log level.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-12-10 16:45:31 -09:00
Lukasz Marek
5f55819850 opts: add list device sources/sinks options 
Allows to list sources/sinks of the devices that implement
that functionality.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-25 20:20:31 +02:00
Lukasz Marek
1cff908589 doc/fftools-common-opts: document -devices option 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-25 19:55:18 +02:00
James Darnley
8c1b942ad7 Replace incorrect use of "multiply" with "multiple" 
Also replace the plural form "multiplies" with "multiples".
 2014-08-27 16:00:17 -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
Michael Niedermayer
d82ecfce07 cmdutils: implement FFREPORT=level=... 
Fixes Ticket3057

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 22:54:32 +02:00
Michael Niedermayer
bb6de15d92 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Match stream id

Conflicts:
	cmdutils.c
	doc/fftools-common-opts.texi

See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 14:21:27 +01:00
Carl Eugen Hoyos
b4c89c90ff Allow hiding the banner. 
Fixes ticket #3246.
 2013-12-29 22:57:20 +01:00
Lenny Wang
64f73acd1d cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 21:21:36 +01:00
Stefano Sabatini
4e268285aa cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
Stefano Sabatini
57618d80af doc/fftools: rework some paragraph in the AVOptions chapter 
Fix typos, and clarify note about codec AVOptions.
 2013-09-22 23:54:39 +02:00
Stefano Sabatini
4149981b37 doc/fftools-common-opts: document -help long and full output 2013-09-17 12:30:40 +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
Anton Khirnov
b3dd2010af doc: cosmetics, rename fftools-common-opts to avtools-.... 2011-09-11 17:30:04 +02:00
Anton Khirnov
05bffc12c4 avconv: move audio_sample_fmt to options context. 
Also document it and replace undocumented and inconsistent
'-sample_fmt list' syntax with -sample_fmts.
 2011-09-11 17:29:55 +02:00
Anton Khirnov
d4863fc1a8 cmdutils: allow precisely specifying a stream for AVOptions. 2011-08-12 18:35:12 +02:00
Anton Khirnov
e0e65ddb88 doc/fftools-common-opts: wording fixes missing from the previous commit. 2011-07-28 17:46:14 +02:00
Anton Khirnov
22b203baf8 doc: document using AVOptions in fftools. 2011-07-28 17:36:38 +02:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/ 
unless it stands for ffmpeg the program or is historic
 2011-03-16 22:01:01 +01:00
Stefano Sabatini
c3d07c173b Deprecate the use of the NO_COLOR environment variable. 
Originally committed as revision 25900 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-06 22:24:21 +00:00
Stefano Sabatini
3011ecdeb7 Introduce FFMPEG_FORCE_NOCOLOR, with the same meaning and use of 
NO_COLOR (but properly prefixed for avoiding namespace conflicts).

Originally committed as revision 25899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-06 21:47:10 +00:00
Etienne Buira
129983408d Allow to force colored output. 
Patch by Etienne Buira, etienne d buira d lists a free d fr

Originally committed as revision 25888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 13:56:49 +00:00