summaryrefslogtreecommitdiff
path: root/libavfilter
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-0865-510/+510
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-0832-292/+292
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-081-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: af_resample: avoid conversion of identical sample formats for 1 channel avcodec: allow either planar or interleaved sample format when encoding mono adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order timefilter: De-doxygenize normal code comments and drop silly ones gxf: Include the right header for the avpriv_frame_rate_tab declaration Conflicts: libavcodec/adpcmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_resample: avoid conversion of identical sample formats for 1 channelJustin Ruggles2012-10-071-1/+6
| | | | | | | | | | When there is only 1 channel, the planar and interleaved formats of the same data type should be treated as identical.
* | vf_tile: fix typos/grammar in commentsBobby Bingham2012-10-061-13/+13
| | | | | | | | Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-066-13/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-062-2/+2
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
| * vf_pad/scale: use double precision for aspect ratios.Anton Khirnov2012-10-062-3/+3
| | | | | | | | | | | | Fixes Bug 203. CC:libav-stable@libav.org
| * lavr: change the type of the data buffers to uint8_t**.Anton Khirnov2012-10-052-7/+7
| | | | | | | | | | | | This is more consistent with what the rest of Libav does. This breaks API.
| * vf_overlay: properly sync inputs.Anton Khirnov2012-10-041-92/+115
| | | | | | | | | | Right now it incorrectly assumes that the frames are sent in the proper order, which worked with old ffmpeg and avconv versions by accident.
* | Do not print debug output for the (MPlayer) pullup filter.Carl Eugen Hoyos2012-10-051-1/+0
| |
* | Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'Michael Niedermayer2012-10-041-21/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b': vf_overlay: get rid of pointless messing with timebase. samplefmt: make av_samples_alloc() initialize the data to silence. libspeexdec: handle NULL return value from speex_packet_to_header() h264probe: Don't error out on bits that no longer are reserved mpegvideo: set extended_data in ff_update_duplicate_context() libspeexdec: properly handle DTX for multiple frames-per-packet libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used libspeexdec: simplify setting of frame_size libspeexdec: set channel_layout Conflicts: libavfilter/vf_overlay.c libavformat/h264dec.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_overlay: get rid of pointless messing with timebase.Anton Khirnov2012-10-041-21/+4
| | | | | | | | | | Output frames correspond 1:1 to input frames on the main input. So use the main input timebase for output.
* | lavfi/transpose: add passthrough optionStefano Sabatini2012-10-022-10/+28
| |
* | lavfi/transpose: add support to named options and shortandsStefano Sabatini2012-10-022-10/+18
| | | | | | | | Allow extensibility.
* | lavfi/edgedetect: add missing minus in a comment.Clément Bœsch2012-10-011-1/+1
| |
* | lavfi: EBU R.128 scanner.Clément Bœsch2012-10-014-1/+750
| |
* | lavfi/ashowinfo: check plane value before deferencing.Clément Bœsch2012-09-301-2/+2
| |
* | Add missing version macros to librariesjamal2012-09-281-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/sink_buffer: implement libav compatibility API.Nicolas George2012-09-273-9/+115
| | | | | | | | | | | | | | | | | | Implement av_buffersink_read() and av_buffersink_read_samples() for ffmpeg's version of buffersink. With this change, avconv linked against ffmpeg's libraries passes the same number of tests whether it uses ffbuffersink or buffersink_old.
* | lavfi: enable buffersinks unconditionally.Nicolas George2012-09-273-20/+12
| | | | | | | | | | They are part of the public API. Their libav compatibility counterpart are already enabled unconditionally.
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use avcodec_free_frame() to free AVFrames.Anton Khirnov2012-09-241-1/+1
| |
* | lavfi: add asendcmd and sendcmd filtersStefano Sabatini2012-09-234-2/+583
| |
* | lavfi/hue: simplify/fix setting logic in set_options()Stefano Sabatini2012-09-231-18/+9
| | | | | | | | | | | | | | | | | | Parse expression only when a new value is explicitly specified. In particular, avoid double free in case an old expression value is cached, it is set in the context, it is freed as the old value, and finally the pointer stored in the context is freed again when the filter is released.
* | lavfi/buffersink: fix check on pixel_fmts in the opaque parameterAndrew Wason2012-09-221-1/+1
| | | | | | | | | | | | Fix programmatic selection of accepted pixel formats. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | hqdn3d: Fix out of array read in LOWPASSLoren Merritt2012-09-222-5/+4
| | | | | | | | | | | | | | Fixes ticket1752 Commit message by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/hue: set to NULL freed pointersStefano Sabatini2012-09-211-1/+2
| | | | | | | | Possibly safer.
* | lavfi/hue: fix crash when resetting the saturation expressionStefano Sabatini2012-09-211-0/+1
| | | | | | | | | | Previously when saturation was reinited, the old value was freed when setting options, and freed again in PARSE_EXPRESSION().
* | vsrc_testsrc: Fix case without a specified durationMichael Niedermayer2012-09-211-0/+1
| | | | | | | | | | | | Fixes regression since 98f753ec5198d4f74ba9f68cc85badf8a6257547 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/select: make lavc dependency optional.Clément Bœsch2012-09-202-4/+15
| |
* | lavfi/testsrc: increase precision of the duration parameterStefano Sabatini2012-09-202-12/+12
| | | | | | | | | | Compute duration in microseconds, rather than in timebase units. Decrease approximation errors.
* | libavfilter/filtfmts: fix argv/argc checksMichael Niedermayer2012-09-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bavfilter/filtfmts: fix type for channel layoutsMichael Niedermayer2012-09-191-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/select: make sure avctx is set before closing it.Clément Bœsch2012-09-181-2/+4
| | | | | | | | | | | | This avoid a crash when the filter fails before config_input(), typically with a syntax error in the next filter: select=gt(scene\,.4),select=fail
* | Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'Michael Niedermayer2012-09-1815-19/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521': alsdec: Check k used for rice decoder. avfiltergraph: silence an uninitialized variable warning xsubenc: reindent lavc: replace AVCodecContext.encode with subtitle-specific callback lavc: add const to private codec class initialization. avconv: don't pass a bogus parameter to avfilter_graph_create_filter(). id3v2: strdup the genre name explicitly. lavf/id3v2: do not export empty fields. buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame() lavfi: replace empty input/output lists with null pointers Conflicts: ffmpeg_filter.c libavcodec/alsdec.c libavcodec/dvdsubenc.c libavcodec/utils.c libavcodec/v210dec.h libavfilter/af_channelsplit.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_ass.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: silence an uninitialized variable warningAnton Khirnov2012-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | The warning is: libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’: libavfilter/avfiltergraph.c:528:9: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized] libavfilter/avfiltergraph.c:479:13: note: ‘best_idx’ was declared here Initialize it to an invalid value and add an assert that it's properly set later.
| * buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()Anton Khirnov2012-09-172-2/+2
| |
| * lavfi: replace empty input/output lists with null pointersMans Rullgard2012-09-1715-18/+21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavfi/ass: mark ass_libavfilter_log_level_map as static const.Clément Bœsch2012-09-161-1/+1
| |
* | af_pan: Fix sscanf formats to work with buggy sscanf implementationsHendrik Leppkes2012-09-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some implementations of sscanf do not handle a space before a trailing %n properly. As an example, MSVC's does this for the second insatnce in this patch, for an input of "0x3:c0=c1:c1=c0": 1) Match the final "c0" or "c1". 2) Realize it's at the end of the string. 3) Check for %n. 4) There is no %n, but a space instead. 5) Leave 'len' unitilialized. So, move it out of the sscanf format strings, and call skip_spaces instead. This bug does not affect skip_spaces since %n is the first and only formatting string. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | lavfi/hue: add dynamic expression evaluation supportJérémy Tran2012-09-152-51/+196
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavfi/avcodec: apply cosmetics style fixesStefano Sabatini2012-09-141-3/+3
| |
* | lavfi: check that buffer and link properties match.Nicolas George2012-09-132-0/+8
| |
* | lavfi: set sample_rate in the default allocator.Nicolas George2012-09-131-0/+2
| |
* | lavfi/aresample: set buffer properties after copy.Nicolas George2012-09-131-1/+3
| | | | | | | | | | | | | | The aresample filter changes the format, layout and/or sample rate, it can not copy them blindly from its input. Related to trac ticket #1671.
* | lavfi/amerge: clarify the error message in case of input overlapStefano Sabatini2012-09-111-1/+2
| |
* | lavfi/amerge: avoid a forward declaration.Clément Bœsch2012-09-111-2/+2
| |
* | lavfi/amerge: fix input pad name behaviour.Clément Bœsch2012-09-111-3/+7
| | | | | | | | | | | | This fixes two problems: - the invalid pad.name stack pointer after init() ends - the duplicated name for all inputs
* | lavfi/setpts: set SAMPLE_RATE to NAN when input is no audioStefano Sabatini2012-09-102-3/+3
| | | | | | | | Should be more robust/consistent.
View Lorry Controller Status