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-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.
2013-03-13cmdutils: improve feedback in case of not found optionStefano Sabatini
2013-03-12Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'Michael Niedermayer
* 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>
2013-03-12Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer
* 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>
2013-03-11cmdutils: remove conditionnal pp include.Clément Bœsch
The definition of the include are needed for builds even without pp. This should fix FATE with --disable-gpl after 63edd2f9.
2013-03-10cmdutils: clarify log message, in case of option routed to both codec and ↵Stefano Sabatini
mux/demux layer
2013-03-10cmdutils: remove duplicated check on CONFIG_POSTPROCStefano Sabatini
The check is already performed by the PRINT_LIB_INFO macro.
2013-03-10cmdutils: make print_all_libs_info() show libavresample versionStefano Sabatini
Even if not directly supported by FFmpeg, it is still useful to see the linked version of libavresample.
2013-03-10cmdutils: fix stylenitsStefano Sabatini
2013-03-08avconv: print an error on applying options of the wrong type.Anton Khirnov
I.e. input options to output files or vice versa.
2013-03-08avplay: switch to new refcounted frames APIAnton Khirnov
Remove now unused cmdutils get_buffer() implementation.
2013-03-07Use the avstring.h locale-independent character type functionsReimar Döffinger
Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-04Remove incorrect use of ctype.h functions.Reimar Döffinger
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>
2013-03-01Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'Michael Niedermayer
* 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>
2013-02-28cmdutils: Allow calling filter_codec_opts without a set encoderMartin Storsjö
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>
2013-02-26Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'Michael Niedermayer
* 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>
2013-02-26cmdutils: only use libavresample when it is enabledJustin Ruggles
avprobe and avserver use cmdutils and do not strictly require libavresample.
2013-02-24ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer
This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24cmdutils: fix null pointer dereferenceMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer
* 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>
2013-02-24avconv: pass libavresample options to AVFilterGraphJustin Ruggles
2013-02-16Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'Michael Niedermayer
* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15get_buffer(): do not initialize the data.Anton Khirnov
There may be more decoders that rely on this. Those should be found and fixed.
2013-02-06Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'Michael Niedermayer
* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d': qtrle: fix the topmost line for 1bit Conflicts: tests/ref/fate/qtrle-1bit See: 1af91978dbab35ba9fdede187577c00d643ae33b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'Michael Niedermayer
* commit '2cd4068071b9a8908823a3107f97e938211045ce': fraps: fix off-by one bug for version 1. Conflicts: libavcodec/fraps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'Michael Niedermayer
* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177': aasc: fix output for msrle compression. msrledec: check bounds before constructing a possibly invalid pointer, cmdutils: remove ansi from the list of broken codecs. Conflicts: tests/ref/fate/aasc Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06Merge commit '238614de679a71970c20d7c3fee08a322967ec40'Michael Niedermayer
* commit '238614de679a71970c20d7c3fee08a322967ec40': cdgraphics: do not rely on get_buffer() initializing the frame. svq1: replace struct svq1_frame_size with an array. vf_yadif: silence a warning. Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06qtrle: fix the topmost line for 1bitKostya Shishkov
Signed-off-by: Anton Khirnov <anton@khirnov.net> CC:libav-stable@libav.org
2013-02-06fraps: fix off-by one bug for version 1.Anton Khirnov
CC:libav-stable@libav.org
2013-02-06aasc: fix output for msrle compression.Anton Khirnov
The bottom line was invalid before. CC:libav-stable@libav.org
2013-02-06cdgraphics: do not rely on get_buffer() initializing the frame.Anton Khirnov
Setting it to zero (instead of 128, as the default get_buffer() does) also produces more correctly-looking output.
2013-02-06cmdutils: remove ansi from the list of broken codecs.Anton Khirnov
It's not relying on get_buffer() initializing the frame since 99e36ddd3ee57c38e6ca9e240ba518848487f849.
2013-01-19cmdline: fix -- to escape files starting with -Michael Niedermayer
Fixes Ticket2127 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-03cmdutils: update copyright year to 2013Johan Andersson
Signed-off-by: Martin Storsjö <martin@martin.st>