summaryrefslogtreecommitdiff
path: root/libavfilter/avfiltergraph.h
Commit message (Collapse)AuthorAge
* Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer2013-04-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38f0c0781a6e099f11c0acec07f9b8be742190c4': lavfi: merge avfiltergraph.h into avfilter.h Conflicts: doc/APIchanges ffmpeg_filter.c libavfilter/avfilter.h libavfilter/avfiltergraph.h libavfilter/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: merge avfiltergraph.h into avfilter.hAnton Khirnov2013-04-11
| | | | | | | | | | We do not support using filters without AVFilterGraph in practice anyway, so there is no point in pretending we do.
* | lavfi: deprecate aconvert.Clément Bœsch2013-04-11
| | | | | | | | This filter is not required anymore with aformat. Drop it at next bump.
* | Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'Michael Niedermayer2013-03-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf': avfiltergraph: replace AVFilterGraph.filter_count with nb_filters Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: replace AVFilterGraph.filter_count with nb_filtersAnton Khirnov2013-03-16
| | | | | | | | This is more consistent with the naming in the rest of Libav.
* | avfilter/avfiltergraph.h: Move public field out of the private fieldsMichael Niedermayer2013-02-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f1223562e134bac6345a465870b9d56ff7d60cf': lavfi: connect libavresample options to af_resample via AVFilterGraph Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: connect libavresample options to af_resample via AVFilterGraphJustin Ruggles2013-02-23
| |
* | avfiltergraph: add aresample_swr_optsMichael Niedermayer2012-11-26
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() ↵Stefano Sabatini2012-07-18
| | | | | | | | @return doxy
* | avfiltergraph: document a catch in request_oldest().Nicolas George2012-07-17
| | | | | | | | | | | | | | This one is tricky. Consider a graph with two sink links, A and B. request_oldest() requests on A, and A returns EOF. This EOF causes a filter to flush pending frames to B; they are unrequested. Then request_oldest() moves on to B, and B returns EOF.
* | Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'Michael Niedermayer2012-06-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1961e46c15c23a041f8d8614a25388a3ee9eff63': lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft lavfi: use proper FF_API guards for different deprecated functions lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft lavfi: remove disabled FF_API_SAMPLERATE64 cruft lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft Conflicts: libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/graphparser.c libavfilter/version.h libavfilter/video.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove disabled FF_API_GRAPH_AVCLASS cruftAnton Khirnov2012-06-26
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: Only use optimizations with cmov if the CPU supports the instruction x86: Add CPU flag for the i686 cmov instruction x86: remove unused inline asm macros from dsputil_mmx.h x86: move some inline asm macros to the only places they are used lavfi: Add the af_channelmap audio channel mapping filter. lavfi: add join audio filter. lavfi: allow audio filters to request a given number of samples. lavfi: support automatically inserting the fifo filter when needed. lavfi/audio: eliminate ff_default_filter_samples(). Conflicts: Changelog libavcodec/x86/h264dsp_mmx.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/version.h libavutil/x86/cpu.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add avfilter_graph_set_auto_convert().Nicolas George2012-05-14
| |
* | avfiltergraph: add avfilter_graph_request_oldest().Nicolas George2012-04-23
| | | | | | | | Keep a heap of all sink links ordered by timestamps.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vsrc_buffer: fix check from 7ae7c41. libxvid: Reorder functions to avoid forward declarations; make functions static. libxvid: drop some pointless dead code wmal: vertical alignment cosmetics wmal: Warn about missing bitstream splicing feature and ask for sample. wmal: Skip seekable_frame_in_packet. wmal: Drop unused variable num_possible_block_size. avfiltergraph: make the AVFilterInOut alloc/free API public graphparser: allow specifying sws flags in the graph description. graphparser: fix the order of connecting unlabeled links. graphparser: add avfilter_graph_parse2(). vsrc_buffer: allow using a NULL buffer to signal EOF. swscale: handle last pixel if lines have an odd width. qdm2: fix a dubious pointer cast WMAL: Do not try to read rawpcm coefficients if bits is invalid mov: Fix detecting there is no sync sample. tiffdec: K&R cosmetics avf: has_duration does not check the global one dsputil: fix optimized emu_edge function on Win64. Conflicts: doc/APIchanges libavcodec/libxvid_rc.c libavcodec/libxvidff.c libavcodec/tiff.c libavcodec/wmalosslessdec.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h libavfilter/vsrc_buffer.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: make the AVFilterInOut alloc/free API publicStefano Sabatini2012-04-14
| | | | | | | | | | | | | | This is required for letting applications to create and destroy AVFilterInOut structs in a convenient way. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * graphparser: add avfilter_graph_parse2().Anton Khirnov2012-04-14
| | | | | | | | | | | | Unlike avfilter_graph_parse(), it returns unlinked inputs and outputs to the caller, which allows parsing of graphs where inputs/outputs are not known in advance.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vsrc_buffer: allow buffering arbitrary number of frames. vf_scale: avoid a pointless memcpy in no-op conversion. avfiltergraph: try to reduce format conversions in filters. avfiltergraph: add an AVClass to AVFilterGraph on next major bump. id3v2: fix skipping extended header in id3v2.4 Conflicts: libavfilter/vf_scale.c libavfilter/vsrc_buffer.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: add an AVClass to AVFilterGraph on next major bump.Anton Khirnov2012-04-01
| | | | | | | | It will be used for logging, possibly also AVOptions.
* | lavfi: add avfilter_graph_dump.Nicolas George2012-01-24
| |
* | graphparser: Fix doxy on avfilter_graph_parse() return value.Michael Niedermayer2011-11-22
| | | | | | | | | | Found-by: ZacS123 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) avconv: Reformat s16 volume adjustment. ARM: NEON optimised vector_fmac_scalar() dca: use vector_fmac_scalar from dsputil dsputil: add vector_fmac_scalar() latmenc: Fix private options vf_unsharp: store hsub/vsub in the filter context vf_unsharp: adopt a more natural order of params in apply_unsharp() vf_unsharp: rename method "unsharpen" to "apply_unsharp" vf_scale: apply the same transform to the aspect during init that is applied per frame vf_pad: fix "vsub" variable value computation vf_scale: add a "sar" variable lavfi: fix realloc size computation in avfilter_add_format() vsrc_color: use internal timebase lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() graphparser: prefer void * over AVClass * for log contexts avfiltergraph: use meaningful error codes avconv: Initialize return value for codec copy path. fate: use 'run' helper for seek-test fate: remove seek-mpeg2reuse test Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. ... Conflicts: doc/filters.texi libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/vf_scale.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()Stefano Sabatini2011-09-28
| | | | | | | | | | | | Require "void *" rather than "AVClass *" for the log context type. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avfilter: Add avfilter_graph_que_command()Michael Niedermayer2011-08-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: Add command passing supportMichael Niedermayer2011-08-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfiltergraph: clarify doxy for avfilter_graph_parse() open_inputs/outputs ↵Stefano Sabatini2011-07-07
| | | | | | | | | | | | params Make it clear that open_inputs/open_outputs are updated only if non-NULL.
* | avfiltergraph: make the AVFilterInOut alloc/free API publicStefano Sabatini2011-06-12
| | | | | | | | | | This is required for letting applications to create and destroy AVFilterInOut structs in a convenient way.
* | avfiltergraph: change the syntax of avfilter_graph_parse()Stefano Sabatini2011-06-12
| | | | | | | | | | | | | | Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI.
* | lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()Stefano Sabatini2011-06-11
| | | | | | | | Require "void *" rather than "AVClass *" for the log context type.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * multiple inclusion guard cleanupDiego Biurrun2011-05-21
| | | | | | | | | | Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-04
| | | | | | | | | | | | | | | | | | | | Make avfilter_graph_free() free not only the internal structures, but also the allocated graph, and set the graph pointer to NULL for increased safety. Simplify usage. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-06
|/ | | | | | | | | | | Make avfilter_graph_free() free not only the internal structures, but also the allocated graph, and set the graph pointer to NULL for increased safety. Simplify usage. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 4359288c565705d1734f63d277f8918ee5af5e54)
* Make avfilter_graph_free() do nothing if graph is NULL.Stefano Sabatini2011-01-12
| | | | Originally committed as revision 26323 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add avfilter_graph_create_filter().Stefano Sabatini2010-12-02
| | | | Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prefix with "ff_" the functions:Stefano Sabatini2010-11-13
| | | | | | | | | | | | ff_avfilter_graph_check_validity() ff_avfilter_graph_config_links() ff_avfilter_graph_config_formats() and move their declaration to internal.h. These functions are never used in application code, so it is better to consider them internal functions, this can be changed later if necessary. Simplify API. Originally committed as revision 25737 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove graphparser.h header, move AVFilterInOut andStefano Sabatini2010-11-07
| | | | | | | | avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h. Simplify, and less confusing for the user. Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename avfilter_graph_destroy() to avfilter_graph_free().Stefano Sabatini2010-11-04
| | | | | | | | The new name is shorter and more consistent with the rest of the API. This change breaks libavfilter API/ABI. Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avfilter_graph_alloc().Stefano Sabatini2010-11-04
| | | | Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add avfilter_graph_config().Stefano Sabatini2010-10-16
| | | | Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix misspelled parameter names in Doxygen documentation.Diego Biurrun2010-07-02
| | | | | | This fixes one Doxygen warning each. Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply grammar/consistency nits to avfilter_graph_add_filter() doxy.Stefano Sabatini2010-04-11
| | | | Originally committed as revision 22842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a log context to avfilter_graph_config_links().Stefano Sabatini2010-01-10
| | | | Originally committed as revision 21121 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avfilter_graph_config_links().Stefano Sabatini2009-05-31
| | | | Originally committed as revision 19066 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply documentation fixes: use third person, fix grammar and removeStefano Sabatini2009-05-14
| | | | | | inconsistent '\p'. Originally committed as revision 18823 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename avfilter_destroy_graph() to avfilter_graph_destroy(), for betterStefano Sabatini2009-02-26
| | | | | | consistency with the rest of the API. Originally committed as revision 17623 to svn://svn.ffmpeg.org/ffmpeg/trunk