aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
Commit message (Collapse)AuthorAgeFilesLines
* lavfi/setfield: remove stray argument in av_log()Stefano Sabatini2012-04-211-1/+1
| | | | | | Fix warning: libavfilter/vf_setfield.c: In function ‘init’: libavfilter/vf_setfield.c:64:20: warning: too many arguments for format [-Wformat-extra-args]
* lavfi/setfield: rename variable top_field_first to modeStefano Sabatini2012-04-211-12/+19
| | | | | The new name better reflects the meaning of the variable, after the recent change.
* lavfi/setfield: add "progressive" optionTim Nicholson2012-04-212-9/+14
| | | | | | Add "prog" parameter value, and deprecate numeric values. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavfi/mp: remove libmpcodecs mirror filterStefano Sabatini2012-04-204-135/+1
| | | | The native libavfilter hflip filter does the same thing.
* lavfi: add avfilter_unref_bufferp()Robert Nagy2012-04-203-1/+16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* yadif: Improve pts calculation for is_second.Robert Nagy2012-04-171-3/+14
| | | | | Tested-by: Robert Nagy <ronag89@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* copy pts and format props between lavfi buffer and frame.Robert Nagy2012-04-171-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-171-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-161-2/+3
| | | | | | | | Prevents it from referring to the rest of the list.
* | vsrc_buffer: fix null ptr segfaultMichael Niedermayer2012-04-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfiltergraph: More advanced heuristic to select colorspace.Michael Niedermayer2012-04-171-7/+31
| | | | | | | | | | | | This fixes regressions caused by switching from ffmpegs system to avfilters. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'Michael Niedermayer2012-04-172-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151-1/+1
| |
* | lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;Robert Nagy2012-04-161-2/+2
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | yadif: fixed missing error handling for poll_frame.Robert Nagy2012-04-151-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-145-25/+268
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * vsrc_buffer: fix check from 7ae7c41.Anton Khirnov2012-04-141-1/+1
| | | | | | | | The user submitted variable in this function is frame, not buf.
| * avfiltergraph: make the AVFilterInOut alloc/free API publicStefano Sabatini2012-04-143-16/+34
| | | | | | | | | | | | | | 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-141-0/+29
| |
| * graphparser: fix the order of connecting unlabeled links.Anton Khirnov2012-04-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-39/+141
| | | | | | | | | | | | 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.
| * vsrc_buffer: allow using a NULL buffer to signal EOF.Anton Khirnov2012-04-142-1/+20
| |
* | lavfi/drawbox: fix width displayed in place of x.Clément Bœsch2012-04-131-1/+1
| |
* | lavfi/mp: remove 2xsai wrapped filterStefano Sabatini2012-04-134-340/+1
| | | | | | | | It was ported to a native libavfilter filter.
* | lavfi: port 2xsai filter from libmpcodecsStefano Sabatini2012-04-134-1/+353
| | | | | | | | | | | | | | | | | | | | Partially based on the port by Niel van der Westhuizen <nielkie@gmail.com>, done for GCI 2010. Same output as the original filter and as fast. See thread: Subject: [FFmpeg-devel] [PATCH] Port MPlayer 2xSaI filter to libavfilter Date: Thu, 25 Nov 2010 01:31:24 +1000
* | lavfi: install asrc_abuffer.h headerStefano Sabatini2012-04-132-3/+3
| | | | | | | | | | The header is part of the public API, in particular is used by doc/examples/filtering_audio.c.
* | vf_lut: fix rgba map regressionMichael Niedermayer2012-04-121-3/+5
| | | | | | | | | | | | Fixes Ticket1184 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-102-2/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) rv40dsp x86: use only one register, for both increment and loop counter rv40dsp: implement prescaled versions for biweight. avconv: use default channel layouts when they are unknown avconv: parse channel layout string nutdec: K&R formatting cosmetics vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata mem: Consistently return NULL for av_malloc(0) vf_overlay: implement poll_frame() vf_scale: support named constants for sws flags. lavc doxy: add all installed headers to doxy groups. lavc doxy: add avfft to the main lavc group. lavc doxy: add remaining avcodec.h functions to a misc doxygen group. lavc doxy: add AVPicture functions to a doxy group. lavc doxy: add resampling functions to a doxy group. lavc doxy: replace \ with / lavc doxy: add encoding functions to a doxy group. lavc doxy: add decoding functions to a doxy group. lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO} lavc doxy: add AVPacket-related stuff to a separate doxy group. lavc doxy: add core functions/definitions to a doxy group. ... Conflicts: ffmpeg.c libavcodec/avcodec.h libavcodec/vda.c libavcodec/x86/rv40dsp.asm libavfilter/vf_scale.c libavformat/nutdec.c libavutil/mem.c tests/ref/acodec/pcm_s24daud Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_overlay: implement poll_frame()Anton Khirnov2012-04-091-1/+14
| | | | | | | | | | | | Signal that it can output a frame when there are frames on the main input and EOF on the overlay input, but a frame is buffered -- e.g. single picture overlay.
| * vf_scale: support named constants for sws flags.Anton Khirnov2012-04-091-1/+10
| |
* | vf_drawtext: fontconfig support.Nicolas George2012-04-101-8/+95
| |
* | vf_drawtext: fix memory leak of draw expression.Nicolas George2012-04-101-0/+2
| |
* | vf_drawtext: fix memory leak of glyph data.Nicolas George2012-04-101-0/+4
| |
* | vf_scale: ensure the palette is set for output.Reimar Döffinger2012-04-091-0/+3
| | | | | | | | | | | | | | | | Since those are pseudo-palette formats, swscale does not write into data[1], swscale must initialize the palette properly itself. This lead to frames that actually decoded as all-gray before. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Mark GRAY8 format as pseudo-paletted.Reimar Döffinger2012-04-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | This fixes that the GIF encoder crashes with it because it has no palette. And the arguments for the pseudopalette apply to gray8 as much as to RGB8 etc. In addition the changes required in lavfi should be needed anyway when adding support for RGB8 etc. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | scale: fix slice rendering with conversion between pal/non-pal.Reimar Döffinger2012-04-091-2/+5
| | | | | | | | | | | | | | We can't use whether the input format is paletted to decide that the output format has a palette in data[1], too, that makes no sense. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavfi/mp: remove remove_logo wrapperStefano Sabatini2012-04-074-910/+1
| | | | | | | | | | removelogo has been ported to libavfilter, and the wrapper was not working.
* | lavfi: port libmpcodecs remove-logo filterStefano Sabatini2012-04-078-2/+803
| | | | | | | | | | | | | | The code is based on the remove-logo filter in MPlayer/libmpcodecs, by Robert Edele, relicensed to LGPL with consent of the author. Address trac issue #249.
* | vsrc_buffer: remove overwrite support.Michael Niedermayer2012-04-061-5/+0
| | | | | | | | | | | | | | the overwrite flag became unused when merging support for buffering multiple frames. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: Factorize declaration of mb_sizes array. vsrc_buffer: when no frame is available, return an error instead of segfaulting. configure: add dl to frei0r extralibs. dsputil x86: use SSE float instruction instead of SSE2 integer equivalent dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype vp8dsp x86: perform rounding shift with a single instruction fate: add BMP tests. swscale: handle complete dimensions for monoblack/white. aacenc: Mark deinterleave_input_samples argument as const. vf_unsharp: Mark readonly variable as const. h264: fix 4:2:2 PCM-macroblocks decoding Conflicts: configure libavcodec/h264.h libavcodec/x86/dsputil_mmx.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vsrc_buffer: when no frame is available, return an error instead of segfaulting.Anton Khirnov2012-04-051-1/+1
| |
| * vf_unsharp: Mark readonly variable as const.Diego Biurrun2012-04-041-2/+2
| | | | | | | | | | This fixes the following warning: libavfilter/vf_unsharp.c:106: warning: initialization discards qualifiers from pointer target type
* | vf_idet: clean detected frame types based on a 4 frame history.Michael Niedermayer2012-04-051-3/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: change individual per frame statistics to debug log level.Michael Niedermayer2012-04-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: print accumulated statistics for single and multi frame detectionMichael Niedermayer2012-04-051-3/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: Print both the single frame based detection and the multi frame one.Michael Niedermayer2012-04-051-4/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: Add last_type variable to make code more readable.Michael Niedermayer2012-04-051-11/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: use enum to represent the type.Michael Niedermayer2012-04-051-14/+28
| | | | | | | | | | | | This will simplify future code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavfilter: add colormatrix filtermultiple authors2012-04-043-0/+391
| | | | | | | | | | | | Ported by: Baptiste Coudurier cleanup+fate by ubitux For detailed authorship of the original code please see avisynth
* | vf_idet: print accumulated statistics at endMichael Niedermayer2012-04-041-1/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>