summaryrefslogtreecommitdiffstats
path: root/libavfilter
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-112-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: rework rules for things in the tools dirMans Rullgard2011-07-101-0/+2
| | | | | | | | | | | | | | | | Declaring tools associated with each library in their respective makefiles allows these tools to easily depend on the correct prerequisites and link against the libs they need. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: add avformat_find_stream_info()Anton Khirnov2011-07-101-1/+1
| | | | | | | | It supports passing options to codecs.
| * lavc: introduce avcodec_open2() as a replacement for avcodec_open().Anton Khirnov2011-07-101-1/+1
| | | | | | | | | | Adds support for decoder-private options and makes setting other options simpler.
* | graphparser: simplify condition in avfilter_graph_parse()Stefano Sabatini2011-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-081-15/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: clean up library installation rules vf_drawtext: Remove some write-only variables. libgsm: Drop const qualifier to silence compiler warning. docs: Remove needless configure options docs: Don't recommend adding --enable-memalign-hack libvo-amrwbenc: Add braces to shut up gcc warning. adts: Fix PCE copying. Conflicts: configure doc/general.texi subdir.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: Remove some write-only variables.Diego Biurrun2011-07-071-15/+2
| | | | | | | | | | libavfilter/vf_drawtext.c:427:22: warning: variable 'dst_pixel' set but not used libavfilter/vf_drawtext.c:463:22: warning: variable 'dst_pixel' set but not used
* | avfiltergraph: clarify doxy for avfilter_graph_parse() open_inputs/outputs ↵Stefano Sabatini2011-07-071-6/+6
| | | | | | | | | | | | params Make it clear that open_inputs/open_outputs are updated only if non-NULL.
* | graphparser: clarify comments in avfilter_graph_parse()Stefano Sabatini2011-07-071-2/+2
| |
* | graphparser: fix logic for updating the open_inputs/outputs in ↵Stefano Sabatini2011-07-071-24/+30
| | | | | | | | | | | | | | | | | | | | 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-061-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add some missing mathematics.h #includes for av_rescale(). opencore-amr: Add missing initializer braces to shut up gcc warning. ARM: workaround for bug in GNU assembler dv: fix comment wording mistake Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c dv: fix valgrind use of uninitialised value warnings. mxfenc: fix ignored drop flag in binary timecode representation. PPC: use Altivec IMDCT only for supported sizes dv: fix comment spelling configure: simplify -rpath-link linker flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add some missing mathematics.h #includes for av_rescale().Diego Biurrun2011-07-051-0/+1
| |
* | libavfilter: add a default to silence a warning.Nicolas George2011-07-051-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-051-9/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (36 commits) ARM: allow unaligned buffer in fixed-point NEON FFT4 fate: test more FFT etc sizes dca: set AVCodecContext frame_size for DTS audio YASM: Shut up unused variable compiler warning with --disable-yasm. x86_32: Fix build on x86_32 with --disable-yasm. iirfilter: add fate test doxygen: Add qmul docs. ogg: propagate return values and return more meaningful error values H.264: fix overreads of qscale_table Remove unused static tables and static inline functions. eval: clear Parser instances before using dct-test: remove 'ref' function pointer from tables build: Remove deleted 'check' target from .PHONY list. oggdec: Abort Ogg header parsing when encountering a data packet. Add LGPL license boilerplate to files lacking it. mxfenc: small typo fix doxygen: Fix documentation for some VP8 functions. sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t* des: allow unaligned input and output buffers aes: allow unaligned input and output buffers ... Conflicts: libavcodec/dct-test.c libavcodec/libvpxenc.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/h264_qpel_mmx.c libavfilter/x86/gradfun.c libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_gradfun: relicense x86 asm to LGPLLoren Merritt2011-07-041-9/+11
| | | | | | | | | | Actually I gave permission for LGPL long ago, but the original import failed to update the license header.
* | vf_pad: fix "vsub" variable value computationStefano Sabatini2011-07-041-1/+1
| | | | | | | | It was shifting 2 rather than 1, +10l.
* | vf_pad: add support for a "sar" variableStefano Sabatini2011-07-042-4/+8
| | | | | | | | Also add a "dar" alias for "a", for avoiding confusion with sar/dar.
* | vf_scale: add a "sar" variableStefano Sabatini2011-07-042-4/+8
| | | | | | | | | | Also create a "dar" alias for the "a" variable, for avoiding possible confusion between dar/sar.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-0411-1/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Do not include log.h in avutil.hMans Rullgard2011-07-031-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do not include pixfmt.h in avutil.hMans Rullgard2011-07-031-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do not include rational.h in avutil.hMans Rullgard2011-07-031-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do not include mathematics.h in avutil.hMans Rullgard2011-07-039-0/+9
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * doxygen: Fix parameter names to match the function prototypes.Diego Biurrun2011-07-031-1/+1
| |
* | Add mode to yadif to enable/disable deinterlacing based on src frame ↵Joakim Plate2011-07-031-2/+26
| | | | | | | | | | | | "interlaced" flag Signed-off-by: Joakim Plate <elupus@ecce.se>
* | vf_lut: set minimum and maximum alpha value for yuva420pStefano Sabatini2011-07-021-0/+1
| |
* | vf_lut: add plane validity check in draw_slice()Stefano Sabatini2011-07-021-1/+1
| | | | | | | | | | | | | | | | The value for inpic->data[plane] with plane >=4 is undefined, and it will contain in general random data. This change adds a check for exiting the loop when plane reaches the value 4. Fix crash (occurring for example with: format=rgba,lut).
* | lavfi: make pix_fmt_is_in() in vf_lut.c an internal functionStefano Sabatini2011-07-014-13/+19
| | | | | | | | | | Also generalize it, making it accept ints rather than pixel formats. Allow factorization.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) swscale: Add Doxygen for hyscale_fast/hScale. fate: enable lavfi-pixmt tests on big endian systems PPC: swscale: disable altivec functions for unsupported formats fate: merge identical pixdesc_be/le tests swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. build: call texi2pod.pl with full path instead of symlink build: include sub-makefiles using full path instead of symlinks swscale: update big endian reference values after dff5a835. wavpack: skip blocks with no samples cosmetics: remove outdated comment that is no longer true build: replace some addprefix/addsuffix with substitution refs avutil: Remove unused arbitrary precision integer code. configure: Drop check for availability of ten assembler operands. aacenc: Save channel configuration for later use. aacenc: Fix codebook trellising for zeroed bands. swscale: change prototypes of scaled YUV output functions. swscale: re-add support for non-native endianness. swscale: disentangle yuv2rgbX_c_full() into small functions. swscale: split yuv2packed[12X]_c() remainders into small functions. swscale: split yuv2packedX_altivec in smaller functions. ... Conflicts: Makefile configure libavcodec/x86/dsputil_mmx.c libavfilter/Makefile libavformat/Makefile libavutil/integer.c libavutil/integer.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: include sub-makefiles using full path instead of symlinksMans Rullgard2011-06-281-2/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | vf_lut: fix draw_slice() in case of non packed image data for packed RGBStefano Sabatini2011-06-271-3/+7
| | | | | | | | | | The previous code was erroneously assuming that the linesize was equivalent to width*pixel_step, which is not always true.
* | lavfi: add testsrc sourceStefano Sabatini2011-06-264-1/+341
| |
* | Revert "build: Remove redundant config.mak includes from subdirectory ↵Reimar Döffinger2011-06-261-0/+2
| | | | | | | | | | | | Makefiles." This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-261-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: silence some annoying armcc warnings ffplay: Remove unused-but-set channels variable from update_sample_display(). build: Add DEP_LIBS dependency directly to the shared library build rule. build: Remove multiple inclusion guards from config.mak. build: Remove redundant config.mak includes from subdirectory Makefiles. aacenc: Mark psy_3gpp_window() as av_unused. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Remove redundant config.mak includes from subdirectory Makefiles.Diego Biurrun2011-06-251-2/+0
| | | | | | | | | | Calling Make from subdirectories is not supported and config.mak has multiple inclusion guards anyway, so the top-level include is enough.
| * Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-201-1/+1
| | | | | | | | av_get_bits_per_sample_fmt() is deprecated.
| * ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAXStefano Sabatini2011-06-201-1/+1
| | | | | | | | | | | | | | Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * drawtext: add braces around initialisers for option defaultsStefano Sabatini2011-06-201-29/+29
| | | | | | | | | | | | | | | | Fix warnings of the type: vf_drawtext.c:NNN: warning: missing braces around initializer vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * drawtext: reindent after the previous commitStefano Sabatini2011-06-201-20/+20
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * drawtext: fix strftime() text expansionStefano Sabatini2011-06-201-18/+27
| | | | | | | | | | | | | | The feature was dropped after the filter was partially rewritten and recommitted. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | vsink_buffer: add missing descriptionStefano Sabatini2011-06-251-0/+1
| |
* | vf_mp: do not add duplicated pixel formats.Clément Bœsch2011-06-221-1/+6
| | | | | | | | | | | | | | This avoid a crash with in avfilter_merge_formats() in case one of the filter formats list has multiple time the same entry. Thanks to Mina Nagy Zaki for helping figuring out the issue.
* | lavfi: minor style fixes in formats.cStefano Sabatini2011-06-221-11/+11
| |
* | avfilter picture pool: double free hotfixMichael Niedermayer2011-06-211-2/+3
| | | | | | | | | | | | This fix introduces a small memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add layout negotiation fields and helper functions.Mina Nagy Zaki2011-06-1927-66/+119
| |
* | lavfi: use int64_t lists in AVFilteFormatsMina Nagy Zaki2011-06-192-15/+32
| | | | | | | | | | | | | | | | | | The list type was changed to int64_t to be able to hold channel layouts. avfilter_make_format_list() still takes a int32_t array and converts it to int64_t. A new function, avfilter_make_format64_list, that takes int64_t arrays has been added.
* | lavfi: fix realloc size computation in avfilter_add_format()Stefano Sabatini2011-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | Replace sizeof((*avff)->formats) with sizeof(*(*avff)->formats) as the size of the array element is given by the pointed element rather than by its pointer. In particular fix computation with the pending patch when sizeof(int64_t) != sizeof(int64_t *).
* | lavfi: fix Makefile HEADERSStefano Sabatini2011-06-191-1/+1
| | | | | | | | | | Add a missing space between vsink_buffer.h and vsrc_buffer.h. 1000l.
* | lavfi: add vsink_buffer, and use it in ff* toolsStefano Sabatini2011-06-195-2/+162
| | | | | | | | Also add the public interface libavfilter/vsink_buffer.h.
* | vsrc_color: use internal timebaseStefano Sabatini2011-06-191-1/+2
| | | | | | | | Avoid timescale conversion, simplify.
OpenPOWER on IntegriCloud