summaryrefslogtreecommitdiff
path: root/cmdutils.c
Commit message (Collapse)AuthorAgeFilesLines
* cmdutils: use macros for device testLukasz Marek2014-12-141-6/+1
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* cmdutils: Exit in case of faulty stream specifiersMichael Niedermayer2014-11-171-1/+1
| | | | | | | Avoids printing confusing and unrelated errors Fixes Ticket2772 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* opts: add list device sources/sinks optionsLukasz Marek2014-10-251-0/+181
| | | | | | | Allows to list sources/sinks of the devices that implement that functionality. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* cmdutils: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer2014-10-251-4/+7
| | | | | | affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'Michael Niedermayer2014-10-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | * commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4': cmdutils: Use the correct guard Conflicts: cmdutils.c See: 35daf3ca8173f80f200860e06a410ced31a8b360 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Use the correct guardLuca Barbato2014-10-171-1/+1
| | | | | | | | | | | | | | The OptionDef arrays are terminated with a { NULL } element not NULL. CC: libav-stable@libav.org Bug-Id: CID 703769
* | Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'Michael Niedermayer2014-09-171-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Print a more sensible message in show_filters() w/o libavfilterDiego Biurrun2014-09-161-2/+4
| | | | | | | | Also avoid an unused variable warning for compilers w/o av_unused support.
* | cmdutils: Add some whitespace when printing layoutsTobias Rapp2014-09-021-4/+4
| | | | | | | | | | | | Adds some more whitespace between channel layout name and decomposition. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-151-1/+1
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-151-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-151-4/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * cmdutils: allow matching by metadata in stream specifiersAnton Khirnov2014-08-131-0/+23
| |
| * avconv: Match stream idLuca Barbato2014-03-131-0/+6
| | | | | | | | Quite useful to select by pid in MPEG-TS.
| * cmdutils: update copyright year to 2014.Johan Andersson2014-01-051-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | cmdutils: ignore sws_flags if swscale is not enabledMichael Niedermayer2014-06-291-0/+5
| | | | | | | | | | | | This avoids some failures during fate when swscale is disabled Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | version string: add copyright line to version stringSimon Thelen2014-06-161-1/+1
| | | | | | | | | | | | | | 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>
* | cmdutils: implement FFREPORT=level=...Michael Niedermayer2014-06-141-2/+12
| | | | | | | | | | | | Fixes Ticket3057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add -devices paramLukasz Marek2014-05-281-3/+32
| | | | | | | | | | | | | | | | 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>
* | cmdutils: omit deprecated codec ids in help outputMichael Niedermayer2014-04-291-0/+3
| | | | | | | | | | | | | | These ids should be meaningless for the end user and would only confuse Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATEDtue46wsdgxfjrt2014-04-261-1/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: use av_mallocz_array()Michael Niedermayer2014-04-081-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONEMichael Niedermayer2014-03-281-1/+2
| | | | | | | | | | | | | | 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>
* | Allow hiding the banner.Carl Eugen Hoyos2013-12-291-1/+5
| | | | | | | | Fixes ticket #3246.
* | cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang2013-12-091-24/+0
| | | | | | | | | | | | | | | | OpenCL devices Reviewed-by: Wei Gao <highgod0401@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: rename version.h to libavutil/ffversion.hTimothy Gu2013-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Revert "configure: add #include "version.h" to config.h"Michael Niedermayer2013-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | 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. "
* | configure: add #include "version.h" to config.hTimothy Gu2013-11-271-1/+0
| | | | | | | | | | | | | | Avoid clash with version.h of the libraries. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: remove this_year constant, use CONFIG_THIS_YEAR insteadStefano Sabatini2013-11-261-3/+1
| | | | | | | | Simplify.
* | configure: define CONFIG_THIS_YEAR at the configure levelStefano Sabatini2013-11-261-1/+1
| | | | | | | | The macro value can be shared between configure script and cmdutils.c.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-241-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-231-0/+1
| |
* | cmdutils&ffmpeg: use av_fopen_utf8() for passlogfileMichael Niedermayer2013-11-211-1/+1
| | | | | | | | | | | | might fix Ticket3056 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: randomize spaces after 69cf626f9.Clément Bœsch2013-11-211-5/+5
| |
* | cmdutils: cosmeticsMichael Niedermayer2013-11-201-3/+3
| | | | | | | | | | | | requested by multiple people Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: Add -buildconf option.Stephen Hutchinson2013-11-191-0/+34
| | | | | | | | | | | | The output is formatted to display one option per line. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix expected signature for show_colors() functionn2.2-devStefano Sabatini2013-10-281-1/+3
| | | | | | | | | | | | | | | | | | 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
* | cmdutils: add -colors optionStefano Sabatini2013-10-271-0/+12
| |
* | Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'Michael Niedermayer2013-10-221-12/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avplay: Accept cpuflags optionLuca Barbato2013-10-221-0/+12
| | | | | | | | | | | | Quite useful for debugging. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | cmdutils: print command support in -filters.Paul B Mahol2013-09-301-3/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cmdutils: silence warning about incompatible pointer typesPaul B Mahol2013-08-301-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cmdutils: Filter non user AVOptions out from what can be set over the ↵Michael Niedermayer2013-08-281-6/+15
| | | | | | | | | | | | command line. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'Michael Niedermayer2013-08-081-1/+4
|\ \ | |/ | | | | | | | | | | | | * 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>
| * cmdutils: Only do the windows-specific commandline parsing on _WIN32Diogo Franco2013-08-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | cmdutils: replace exit() by exit_program()Michael Niedermayer2013-07-081-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'Michael Niedermayer2013-07-081-8/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '636ced8e1dc8248a1353b416240b93d70ad03edb': cmdutils: wrap exit explicitly Conflicts: avprobe.c cmdutils.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: wrap exit explicitlyLuca Barbato2013-07-071-8/+23
| | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status