summaryrefslogtreecommitdiff
path: root/cmdutils.c
Commit message (Collapse)AuthorAge
* cmdutils: replace exit() by exit_program()Michael Niedermayer2013-07-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'Michael Niedermayer2013-07-08
|\ | | | | | | | | | | | | | | | | | | | | | | * 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-07
| | | | | | | | | | | | | | | | | | | | 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
* | cmdutils: dont change the log level for -reportMichael Niedermayer2013-06-24
| | | | | | | | | | | | Fixes Ticket2476 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: print threading capabilities for audio codecsPaul B Mahol2013-06-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cmdutils: print slice threading flag in -filters.Clément Bœsch2013-05-24
| |
* | Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'Michael Niedermayer2013-05-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: add a slice threading infrastructureAnton Khirnov2013-05-24
| | | | | | | | Mostly based on libavcodec's
* | cmdutils: show timeline support in -filters listingStefano Sabatini2013-05-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*Anton Khirnov2013-05-15
| |
* | lavfi: add timeline support.Clément Bœsch2013-04-23
| | | | | | | | | | Flag added in a few simple filters. A bunch of other filters can likely use the feature as well.
* | cmdutils: make the "-help filter=" output less confusingMichael Niedermayer2013-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | cmdutils: slightly better -filters output.Clément Bœsch2013-04-17
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-16
|\| | | | | | | | | | | | | | | * 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>
| * cmdutils: Fix build with lavfi disabledAnton Khirnov2013-04-16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | cmdutils: print if filters are sources or sinks.Clément Bœsch2013-04-13
| |
* | Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'Michael Niedermayer2013-04-12
|\| | | | | | | | | | | | | | | | | | | * commit '921046008f5335601f9d76dc3a768eb5cd91e1b9': cmdutils: allow -h filter=<name> to print information about a filter. Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: allow -h filter=<name> to print information about a filter.Anton Khirnov2013-04-11
| |
| * avtools: move media_type_string() from avprobe to cmdutils.Anton Khirnov2013-04-11
| | | | | | | | It will be useful outside of avprobe.
* | Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'Michael Niedermayer2013-04-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: change the filter registering system to match the other librariesAnton Khirnov2013-04-11
| | | | | | | | Removes an arbitrary hardcoded limit on the number of filters.
* | cmdutils: add opencl command line options to ffmpeghighgod04012013-04-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: remove error message from opt_default() in case of missing optionStefano Sabatini2013-04-05
| | | | | | | | | | | | | | | | 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 -
* | cmdutils: fix build with --disable-avfilter.Clément Bœsch2013-04-01
| |
* | cmdutils: support filters in the help topic system.Clément Bœsch2013-03-31
| |
* | cmdutils: allow forcing log line repeationMichael Niedermayer2013-03-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | opt: re-enable memleak fix for duplicated options.Clément Bœsch2013-03-13
| | | | | | | | | | | | | | 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.
* | cmdutils: improve feedback in case of not found optionStefano Sabatini2013-03-13
| |
* | Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38': avconv: print an error on applying options of the wrong type. atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize output-example: Update to use encode_video2 instead of the now dropped encode_video Conflicts: doc/examples/muxing.c ffmpeg_opt.c libavutil/atomic.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: print an error on applying options of the wrong type.Anton Khirnov2013-03-08
| | | | | | | | I.e. input options to output files or vice versa.
* | Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '354468fc12dcf93e7fb4af552e18906771913273': avplay: switch to new refcounted frames API avconv: convert to new refcounted AVFrame API Conflicts: cmdutils.c ffmpeg.c ffmpeg.h ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: switch to new refcounted frames APIAnton Khirnov2013-03-08
| | | | | | | | Remove now unused cmdutils get_buffer() implementation.
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-07
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | cmdutils: remove conditionnal pp include.Clément Bœsch2013-03-11
| | | | | | | | | | The definition of the include are needed for builds even without pp. This should fix FATE with --disable-gpl after 63edd2f9.
* | cmdutils: clarify log message, in case of option routed to both codec and ↵Stefano Sabatini2013-03-10
| | | | | | | | mux/demux layer
* | cmdutils: remove duplicated check on CONFIG_POSTPROCStefano Sabatini2013-03-10
| | | | | | | | The check is already performed by the PRINT_LIB_INFO macro.
* | cmdutils: make print_all_libs_info() show libavresample versionStefano Sabatini2013-03-10
| | | | | | | | | | Even if not directly supported by FFmpeg, it is still useful to see the linked version of libavresample.
* | cmdutils: fix stylenitsStefano Sabatini2013-03-10
| |
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-03
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'Michael Niedermayer2013-03-01
|\| | | | | | | | | | | | | | | * commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a': cmdutils: Allow calling filter_codec_opts without a set encoder pnm: Use av_pix_fmt_desc_get instead of accessing the array directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Allow calling filter_codec_opts without a set encoderMartin Storsjö2013-02-28
| | | | | | | | | | | | | | In this case, no encoder specific options are filtered, only options specific to that codec type in general. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8da807537e314d74cb6d93598f1dcfb891fa655': cmdutils: only use libavresample when it is enabled libschroedinger: cosmetics: rename variable avccontext to avctx vorbisenc: cosmetics: rename variable avccontext to avctx Conflicts: cmdutils.c libavcodec/libschroedinger.c libavcodec/libschroedingerenc.c libavcodec/vorbisenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: only use libavresample when it is enabledJustin Ruggles2013-02-25
| | | | | | | | avprobe and avserver use cmdutils and do not strictly require libavresample.
* | ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer2013-02-24
| | | | | | | | | | | | | | This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix null pointer dereferenceMichael Niedermayer2013-02-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c7db097ebe1fb5c233cedd8846615074e7d6044': avconv: pass libavresample options to AVFilterGraph Conflicts: cmdutils.c cmdutils.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: pass libavresample options to AVFilterGraphJustin Ruggles2013-02-23
| |
* | Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'Michael Niedermayer2013-02-16
|\| | | | | | | | | | | | | | | | | | | * commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * get_buffer(): do not initialize the data.Anton Khirnov2013-02-15
| | | | | | | | | | There may be more decoders that rely on this. Those should be found and fixed.