summaryrefslogtreecommitdiff
path: root/libavfilter/graphparser.c
Commit message (Collapse)AuthorAge
* Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'Michael Niedermayer2012-10-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b891d17c531e8a63c2974aab4bf997ce70746f3': avconv: fix bitrate report when writing to /dev/null avfilter: fix graphparser memleaks on error paths rawdec: remove ff_raw_read_header pcmdec: remove dependency from rawdec g722: refactor out of rawdec.c rawvideo: use a specific read_header Conflicts: ffmpeg.c libavformat/Makefile libavformat/rawdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter: fix graphparser memleaks on error pathsJanne Grunau2012-10-25
| | | | | | | | Fixes CID700635, CID700636 and CID732274.
* | avfilter_graph_parse: add support for parsing sws_flagsMichael Niedermayer2012-10-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/graphparser: fix parsing error in case of NULL sws_opts additionStefano Sabatini2012-10-21
| | | | | | | | | | | | If sws_opts was NULL it was resulting in the args being set to "W:H:(null)", which with the new parsing code was generating a syntax failure.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | 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-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputsAnton Khirnov2012-06-13
| | | | | | | | This is more consistent with naming in the rest of Libav.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo3: add parens around some macro arguments h264: use proper PROLOGUE statement for a function using 8 registers. doc: Update sample Vim config with suitable (function) indentation settings. dv: Merge dvquant.h into dvdata.c where all other DV tables reside. dv: Move static tables only used in one place to where they are used. graphparser: set next to NULL on an entry extracted from inputs list doc/filters: update documentation. avconv: flush decoders immediately after an EOF. avconv: send EOF to vsrc_buffer. avconv: reindent. Conflicts: doc/filters.texi ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * graphparser: set next to NULL on an entry extracted from inputs listAnton Khirnov2012-04-16
| | | | | | | | Prevents it from referring to the rest of the list.
* | Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'Michael Niedermayer2012-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b266da3d35f3f7a61258b78384dfe920d875d29': avconv: add support for complex filtergraphs. avconv: make filtergraphs global. avconv: move filtered_frame from InputStream to OutputStream. avconv: don't set output width/height directly from input value. avconv: move resample_{width,height,pix_fmt} to InputStream. avconv: remove a useless variable from OutputStream. avconv: get output pixel format from lavfi. graphparser: fix the order in which unlabeled input links are returned. avconv: change {input,output}_{streams,files} into arrays of pointers. avconv: don't pass input/output streams to some functions. Conflicts: cmdutils.c cmdutils.h doc/ffmpeg.texi ffmpeg.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * graphparser: fix the order in which unlabeled input links are returned.Anton Khirnov2012-04-15
| |
* | 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: allow specifying sws flags in the graph description.Anton Khirnov2012-04-14
| |
| * graphparser: fix the order of connecting unlabeled links.Anton Khirnov2012-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, e.g. scale,[in]overlay would connect scale to the first overlay input and [in] to the second, which goes against the documentation and is unintuitive. The bug happens because of the ordering mess in curr_inputs variable: 1) the unlabeled links from the previous filter are added to it in correct order 2) input labels are parsed and inserted to the beginning one by one (i.e. in reverse order) 3) curr_inputs is matched against filter inputs in reverse order Fix the problem by always using proper ordering without trying to be clever.
| * 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.
| * 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>
| * graphparser: prefer void * over AVClass * for log contextsStefano Sabatini2011-09-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libavfilter/graphparser: Avoid spaces in filter instance names.Michael Niedermayer2011-08-30
| | | | | | | | | | | | This makes it easier to refer to filters where things are seperated by spaces. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Make sure parameter names match between .c and .h files.Diego Biurrun2011-07-14
| |
* | graphparser: simplify condition in avfilter_graph_parse()Stefano Sabatini2011-07-10
| | | | | | | | | | | | | | | | | | | | | | Since avfilter_graph_parse() creates the "[in]" inout for the first unlabelled input pad, it is expected that it will create an "[out]" inout for last unlabelled output pad, even in the case where it cannot find any open input pad with that name. This change removes the check on the existence of an open input pad named "out", so it simplifies the checked condition while implementing a more intuitive behavior.
* | graphparser: clarify comments in avfilter_graph_parse()Stefano Sabatini2011-07-07
| |
* | graphparser: fix logic for updating the open_inputs/outputs in ↵Stefano Sabatini2011-07-07
| | | | | | | | | | | | | | | | | | | | avfilter_graph_parse() Create open_inputs and open_outputs structs if they are not provided by the user, and free them before exit. In particular, fix NULL pointer dereference and crash, in case the passed open_inputs/outputs is NULL and the parsing failed.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Fix parameter names to match the function prototypes.Diego Biurrun2011-07-03
| |
| * graphparser: add a NULL check on the argument passed to strstrStefano Sabatini2011-04-25
| | | | | | | | | | | | | | Fix crash in create_filter() which occurrs if a scale filter with no args is provided. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make avfilter_graph_parse() not free the input graphStefano Sabatini2011-02-04
| | | | | | | | | | | | | | | | | | | | | | Make avfilter_graph_parse() only release the internal structures allocated during the parsing, and leave to free the graph itself to the calling code. This approach looks cleaner, as the graph is not allocated by the function. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | graphparser: add missing NULL check in avfilter_graph_parse()Stefano Sabatini2011-06-18
| | | | | | | | | | | | | | | | Fix a crash occurring when open_inputs is NULL and *open_inputs is checked, the crash was introduced by the recent avfilter_graph_parse() syntax change. In particular, fix graph2dot crash.
* | 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.
* | graphparser: prefer void * over AVClass * for log contextsStefano Sabatini2011-06-12
| |
* | 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.
* | graphparser: add a NULL check on the argument passed to strstrStefano Sabatini2011-03-30
| | | | | | | | | | Fix crash in create_filter() which occurrs if a scale filter with no args is provided.
* | Make avfilter_graph_parse() not free the input graphStefano Sabatini2011-02-06
|/ | | | | | | | | | | | Make avfilter_graph_parse() only release the internal structures allocated during the parsing, and leave to free the graph itself to the calling code. This approach looks cleaner, as the graph is not allocated by the function. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit e8e5dde779fca80d86e00baea26d1baca333f4c0)
* Add the word "Parsed" in the parsed filter names.Stefano Sabatini2011-01-14
| | | | Originally committed as revision 26334 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make avfilter_parse_graph() output a more meaningful message when anStefano Sabatini2010-12-12
| | | | | | invalid filterchain is detected. Originally committed as revision 25936 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In libavfilter, use consistently "Copyright (c)" in the licenseStefano Sabatini2010-11-28
| | | | | | headers. Originally committed as revision 25838 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move the av_parse_color() function from libavfilter to libavcoreAurelien Jacobs2010-11-17
| | | | Originally committed as revision 25761 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing check on the existence of an associated output pad forStefano Sabatini2010-11-11
| | | | | | | | each specified output link label. Fix crash. Originally committed as revision 25723 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename avfilter_destroy() as avfilter_free().Stefano Sabatini2010-11-08
| | | | | | | The new name is shorter and more consistent with the FFmpeg API, and sounds less evil. Originally committed as revision 25707 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
* Extend documentation for parse_filter().Stefano Sabatini2010-11-07
| | | | Originally committed as revision 25703 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename AVFilterInOut field filter to filter_ctx, more semantically correct.Stefano Sabatini2010-11-07
| | | | Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make avfilter_graph_parse() always return meaningful error codes.Stefano Sabatini2010-11-07
| | | | Originally committed as revision 25699 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make parse_outputs() always return meaningful error codes.Stefano Sabatini2010-11-07
| | | | Originally committed as revision 25698 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 08:04:43 +0000