Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-30Allow hiding the banner.Carl Eugen Hoyos
Fixes ticket #3246.
2013-12-10cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang
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-01build: rename version.h to libavutil/ffversion.hTimothy Gu
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-28Revert "configure: add #include "version.h" to config.h"Michael Niedermayer
This reverts commit ca21116b3f53a9bdd74364bfab9cde70a044b165. 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-28configure: add #include "version.h" to config.hTimothy Gu
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-26cmdutils: remove this_year constant, use CONFIG_THIS_YEAR insteadStefano Sabatini
Simplify.
2013-11-26configure: define CONFIG_THIS_YEAR at the configure levelStefano Sabatini
The macro value can be shared between configure script and cmdutils.c.
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-11-21cmdutils&ffmpeg: use av_fopen_utf8() for passlogfileMichael Niedermayer
might fix Ticket3056 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21cmdutils: randomize spaces after 69cf626f9.Clément Bœsch
2013-11-20cmdutils: cosmeticsMichael Niedermayer
requested by multiple people Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20cmdutils: Add -buildconf option.Stephen Hutchinson
The output is formatted to display one option per line. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28cmdutils: fix expected signature for show_colors() functionn2.2-devStefano Sabatini
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-27cmdutils: add -colors optionStefano Sabatini
2013-10-22Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'Michael Niedermayer
* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5': avplay: Accept cpuflags option Conflicts: cmdutils_common_opts.h doc/ffmpeg.texi doc/fftools-common-opts.texi ffmpeg_opt.c See: 1060e9ce5454e7ac009969ab2cf8f7cd83a69ac3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22avplay: Accept cpuflags optionLuca Barbato
Quite useful for debugging. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-30cmdutils: print command support in -filters.Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-30cmdutils: silence warning about incompatible pointer typesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-28cmdutils: Filter non user AVOptions out from what can be set over the ↵Michael Niedermayer
command line. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'Michael Niedermayer
* 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-08cmdutils: Only do the windows-specific commandline parsing on _WIN32Diogo Franco
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-07-08cmdutils: replace exit() by exit_program()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'Michael Niedermayer
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb': cmdutils: wrap exit explicitly Conflicts: avprobe.c cmdutils.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07cmdutils: wrap exit explicitlyLuca Barbato
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-06-24cmdutils: dont change the log level for -reportMichael Niedermayer
Fixes Ticket2476 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-07cmdutils: print threading capabilities for audio codecsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24cmdutils: print slice threading flag in -filters.Clément Bœsch
2013-05-24Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'Michael Niedermayer
* 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-24lavfi: add a slice threading infrastructureAnton Khirnov
Mostly based on libavcodec's
2013-05-19cmdutils: show timeline support in -filters listingStefano Sabatini
2013-05-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* Conflicts: doc/APIchanges libavcodec/avpicture.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/tiffenc.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavutil/imgutils.c libavutil/pixdesc.c libavutil/version.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*Anton Khirnov
2013-04-23lavfi: add timeline support.Clément Bœsch
Flag added in a few simple filters. A bunch of other filters can likely use the feature as well.
2013-04-18cmdutils: make the "-help filter=" output less confusingMichael Niedermayer
Example: Filter overlay Overlay a video source on top of the input. Inputs: #0: main (video) #1: overlay (video) Outputs: #0: default (video) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17cmdutils: slightly better -filters output.Clément Bœsch
2013-04-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: cmdutils: Fix build with lavfi disabled flvenc: do not mux more than one stream per type Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16cmdutils: Fix build with lavfi disabledAnton Khirnov
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-13cmdutils: print if filters are sources or sinks.Clément Bœsch
2013-04-12Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'Michael Niedermayer
* commit '921046008f5335601f9d76dc3a768eb5cd91e1b9': cmdutils: allow -h filter=<name> to print information about a filter. Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'Michael Niedermayer
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da': lavfi: change the filter registering system to match the other libraries Conflicts: cmdutils.c ffplay.c libavfilter/avfilter.c libavfilter/avfilter.h This removes the ability to put AVFilters in read only memory and having them shareable. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11cmdutils: allow -h filter=<name> to print information about a filter.Anton Khirnov
2013-04-11avtools: move media_type_string() from avprobe to cmdutils.Anton Khirnov
It will be useful outside of avprobe.
2013-04-11lavfi: change the filter registering system to match the other librariesAnton Khirnov
Removes an arbitrary hardcoded limit on the number of filters.
2013-04-11cmdutils: add opencl command line options to ffmpeghighgod0401
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05cmdutils: remove error message from opt_default() in case of missing optionStefano Sabatini
A similar error message is generated by the calling function, avoid duplication and spurious error message occurring with negated boolean options introduced in 8bb5680, which can be reproduced for example with the command: ffmpeg -f lavfi -i testsrc=d=0.1 -nostdin -f null -
2013-04-01cmdutils: fix build with --disable-avfilter.Clément Bœsch
2013-03-31cmdutils: support filters in the help topic system.Clément Bœsch
2013-03-31cmdutils: allow forcing log line repeationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13opt: re-enable memleak fix for duplicated options.Clément Bœsch
The memleak fix in a1bcc76e was causing problems when the original string wasn't NULL or av_malloc'ed, thus was disabled. It seems the only OPT_STRING occurence where it needed to be fixed is in ffserver. This commit fixes that specific problem and so re-enable the original code.