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
66,851 Commits 37 Branches 400 Tags 460 MiB
83f84e4c53
Commit Graph

484 Commits

Author SHA1 Message Date
Michael Niedermayer
9ac08d93b2 Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286' 
* commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
  cmdutils: Print a more sensible message in show_filters() w/o libavfilter

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-17 19:59:10 +02:00
Diego Biurrun
2dd09ebf55 cmdutils: Print a more sensible message in show_filters() w/o libavfilter 
Also avoid an unused variable warning for compilers w/o av_unused support.
 2014-09-16 09:37:14 -07:00
Tobias Rapp
2c43cfe2d4 cmdutils: Add some whitespace when printing layouts 
Adds some more whitespace between channel layout name and decomposition.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 18:44:07 +02:00
Michael Niedermayer
81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +02:00
Michael Niedermayer
60dbed6067 Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
  cosmetics: Write NULL pointer inequality checks more compactly

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/h263dec.c
	libavcodec/libxvid.c
	libavcodec/rv10.c
	libavcodec/utils.c
	libavformat/format.c
	libavformat/matroskadec.c
	libavformat/segment.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:26:12 +02:00
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Gabriel Dume
4b1f5e5090 cosmetics: Write NULL pointer inequality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 05:34:13 -07:00
Gabriel Dume
f929ab0569 cosmetics: Write NULL pointer equality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 03:18:18 -07:00
Anton Khirnov
481a366749 cmdutils: allow matching by metadata in stream specifiers 2014-08-13 17:24:18 +00:00
Michael Niedermayer
7f5d75f95b cmdutils: ignore sws_flags if swscale is not enabled 
This avoids some failures during fate when swscale is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-29 17:27:23 +02:00
Simon Thelen
389d45351e version string: add copyright line to version string 
Show the copyright when running `ffmpeg -version'. This is useful for
end users trying to determine whether they are using FFmpeg or Libav.

Signed-off-by: Simon Thelen <ffmpeg@c-14.de>
 2014-06-16 10:24:28 -08: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
Lukasz Marek
8518da23f5 ffmpeg: add -devices param 
FFmpeg mix devices and file formats when -formats option is used.
This commit adds a -devices param to list devices only.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 03:52:50 +02:00
Michael Niedermayer
978c193d47 cmdutils: omit deprecated codec ids in help output 
These ids should be meaningless for the end user and would only
confuse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 22:13:35 +02:00
tue46wsdgxfjrt
262ea965e7 cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 19:21:59 +02:00
Michael Niedermayer
53487268e5 cmdutils: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 15:44:32 +02:00
Michael Niedermayer
2b4543ff69 cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE 
This fixes cases where the codec is detect later than the stream creation
No testcase with unmodified source known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 17:29:26 +01:00
Luca Barbato
81498ceb5b avconv: Match stream id 
Quite useful to select by pid in MPEG-TS.
 2014-03-13 11:59:34 +01:00
Johan Andersson
7ce88e5ec4 cmdutils: update copyright year to 2014. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-05 22:39:35 +02: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
Timothy Gu
82b2e9cb1d build: rename version.h to libavutil/ffversion.h 
Also the libavutil/ffversion.h will be installed.

Rationale:
* Applications might want to know FFmpeg's version besides the individual
  libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
  a library source file includes both and is compiled on an out-of-tree build.

Fixes #1769.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-30 21:42:55 +01:00
Michael Niedermayer
0075a22f41 Revert "configure: add #include "version.h" to config.h" 
This reverts commit ca21116b3f.

Revert suggested by Jamal:
"Bad secondary effect i just noticed: Every time version.h is changed
 (git pull for example), anything that includes config.h will be
 recompiled. And that means pretty much every single file in the tree.
"
 2013-11-28 00:19:45 +01:00
Timothy Gu
ca21116b3f configure: add #include "version.h" to config.h 
Avoid clash with version.h of the libraries.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 23:06:13 +01:00
Stefano Sabatini
8bf7ea8ac2 cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead 
Simplify.
 2013-11-26 10:03:32 +01:00
Stefano Sabatini
4c4710a745 configure: define CONFIG_THIS_YEAR at the configure level 
The macro value can be shared between configure script and cmdutils.c.
 2013-11-26 09:54:40 +01:00
Michael Niedermayer
ccdfa3e271 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:21:19 +01:00
Diego Biurrun
8f8bc92365 Add missing #includes for *INT64_MAX and *INT64_C 2013-11-23 21:55:52 +01:00
Michael Niedermayer
d7ac887cd6 cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile 
might fix Ticket3056

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 18:27:46 +01:00
Clément Bœsch
4e70eeef3a cmdutils: randomize spaces after 69cf626f9. 2013-11-21 12:52:30 +01:00
Michael Niedermayer
f95b5d2a11 cmdutils: cosmetics 
requested by multiple people

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 00:23:23 +01:00
Stephen Hutchinson
69cf626f9c cmdutils: Add -buildconf option. 
The output is formatted to display one option per line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 22:09:48 +01:00
Stefano Sabatini
6baf9c4406 cmdutils: fix expected signature for show_colors() function 
Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol
 2013-10-28 09:41:25 +01:00
Stefano Sabatini
4e268285aa cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
Michael Niedermayer
cf47a6a1a0 Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 
* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5':
  avplay: Accept cpuflags option

Conflicts:
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	doc/fftools-common-opts.texi
	ffmpeg_opt.c

See: 1060e9ce54
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:07:28 +02:00
Luca Barbato
f825d42bcc avplay: Accept cpuflags option 
Quite useful for debugging.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:49:31 +02:00
Paul B Mahol
f4ab723a79 cmdutils: print command support in -filters. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 10:15:22 +00:00
Paul B Mahol
48cd1037f6 cmdutils: silence warning about incompatible pointer types 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 12:41:36 +00:00
Michael Niedermayer
70106e73c5 cmdutils: Filter non user AVOptions out from what can be set over the command line. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 00:25:13 +02:00
Michael Niedermayer
f09b5fb4af Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520' 
* commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520':
  libavutil: Don't use fcntl if the function does not exist
  cmdutils: Only do the windows-specific commandline parsing on _WIN32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 11:54:14 +02:00
Diogo Franco
e8edf4e1cf cmdutils: Only do the windows-specific commandline parsing on _WIN32 
Fixes commandline parsing on Cygwin (on 64 bit, and on very recent
32 bit), where the configure check does find the CommandLineToArgvW
function (since it exists in the link libraries and in the headers),
but whose GetCommandLineW() only returns the application's path.
(This is due to a cygwin internal optimization, see
http://cygwin.com/ml/cygwin/2013-07/msg00538.html for details.)
Arguments are only given through main's argc/argv, and they're already
UTF-8.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-08 10:59:03 +03:00
Michael Niedermayer
5d3c3035b7 cmdutils: replace exit() by exit_program() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 11:12:32 +02:00
Michael Niedermayer
f982d006bb Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
	avprobe.c
	cmdutils.c
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:34:11 +02:00
Luca Barbato
636ced8e1d cmdutils: wrap exit explicitly 
Some C runtime implementations deadlock when calling threading functions
on the atexit() handler.

Use a simpler wrapper similar to av_log to call the cleanup function
before exit.

Bug-Id: 523
 2013-07-07 21:43:23 +02:00
Michael Niedermayer
46312fc2a9 cmdutils: dont change the log level for -report 
Fixes Ticket2476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 02:59:05 +02:00
Paul B Mahol
c59c0488ec cmdutils: print threading capabilities for audio codecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 14:24:52 +00:00
Clément Bœsch
9c50e52005 cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
Michael Niedermayer
8d4e969afe Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f' 
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 14:07:00 +02:00
Anton Khirnov
129bb23843 lavfi: add a slice threading infrastructure 
Mostly based on libavcodec's
 2013-05-24 09:28:18 +02:00
Stefano Sabatini
427b51269e cmdutils: show timeline support in -filters listing 2013-05-19 19:55:15 +02:00