summaryrefslogtreecommitdiff
path: root/libavfilter
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-06
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove request/poll and drawing functions from public API on next bumpAnton Khirnov2012-06-05
| | | | | | | | | | They are only useful inside filters and we don't allow user filters for now.
| * lavfi: make avfilter_insert_pad and pals private on next bump.Anton Khirnov2012-06-05
| | | | | | | | | | They are only useful inside filters and we don't allow user filters for now.
| * lavfi: make formats API private on next bump.Anton Khirnov2012-06-05
| | | | | | | | | | It is only useful inside filters and we don't allow user filters for now.
* | lavfi: remove more instances of avfilter_default_filter_name()Stefano Sabatini2012-06-05
| | | | | | | | They were discarded in 0f0f3bd1e0.
* | lavfi: move avfilter_copy_frame_props() definition from buffer.c to avcodec.cStefano Sabatini2012-06-05
| | | | | | | | | | The new location is more suited, as it is where the lavfi/lavc glue is defined.
* | aconvert filter needs to configure sampleratesAndrew Wason2012-06-05
| | | | | | | | | | | | | | I changed the *_set_common_* functions to only set unset formats, then added a wrapper that calls them after the filters query_formats. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfiltergraph: call query_formats on inputs first.Nicolas George2012-06-05
| | | | | | | | | | | | | | This is a temporary workaround for amerge, until format renegociation is implemented. Should fix trac ticket #1400.
* | avfiltergraph: check query_formats return value.Nicolas George2012-06-05
| |
* | lavfi: move tracing utilities definition from video.c to avfilter.cStefano Sabatini2012-06-05
| | | | | | | | | | These utilities are meant to be defined in avfilter.c, since they are generic and thus contain both audio and video code.
* | lavfi/select: use exported dsputil_init function.Clément Bœsch2012-06-05
| | | | | | | | | | This is the deprecated version of the function but it is exported, so it should fix the shared FATE box.
* | lavfi/select: 10l: llabs -> fabs after switching types.Clément Bœsch2012-06-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Write chan atom for all audio tracks in mov mode movies. mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing doc/avconv: add some details about the transcoding process. avidec: make scale and rate unsigned. avconv: check output stream recording time before each frame returned from filters avconv: split selecting input file out of transcode(). avconv: split checking for active outputs out of transcode(). avfiltergraph: make some functions static. Conflicts: ffmpeg.c libavfilter/avfiltergraph.c libavfilter/internal.h libavformat/mpegtsenc.c tests/ref/fate/acodec-alac tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfiltergraph: make some functions static.Anton Khirnov2012-06-04
| | | | | | | | They are not used outside of avfiltergraph.c
* | lavfi/select: add scene detection.Clément Bœsch2012-06-04
| | | | | | | | | | Based on the shotdetect algorithm (http://shotdetect.nonutc.fr/ by Johan MATHE johan.mathe tremplin-utc.net).
* | lavfi: use av_default_item_name() as filter private context loggerStefano Sabatini2012-06-04
| | | | | | | | | | | | avfilter_default_filter_name() is supposed to access an AVFilterContext struct, if used with a private struct it will cause a crash since it will access fields which are non defined in the private struct.
* | lavfi: add avfilter_default_filter_name()Stefano Sabatini2012-06-04
| | | | | | | | | | | | | | | | The function is modelled after av_default_item_name(), and will print the name of the instance filter if defined, otherwise the name of the filter. This allows to show the instance name in the log, which is useful when debugging complex filter graphs.
* | lavfi/lut: fix component -> rgba mappingStefano Sabatini2012-06-04
| |
* | set some categories of some AVClass structsMichael Niedermayer2012-06-03
| | | | | | | | | | | | Please help setting the category for all remaining AVClasses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_amerge: use the buferqueue API.Nicolas George2012-06-03
| |
* | af_astreamsync: set samples rate in query_formats.Nicolas George2012-06-03
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines http: Pass the proper return code of net IO operations http: Add 'post_data', a new option which sets custom HTTP post data lavfi: amix: check active input count before calling request_samples vp8: move block coeff arithcoder on stack. mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3. Conflicts: libavformat/ac3dec.c libavformat/mp3dec.c tests/fate/ac3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: amix: check active input count before calling request_samplesJustin Ruggles2012-05-30
| | | | | | | | fixes use of the amix filter with only 1 input
| * avfilter: include required header file avfilter.h in video.hJanne Grunau2012-05-29
| |
* | vf_overlay: rewrite request/push logic.Nicolas George2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | The old implementation, upon receiving a frame on the main input, would request an overlay frame if necessary. This could generate an infinite recursion, off-by-one frame mismatch and other harmful effects, especially it the split filter is present upgraph. The new implementation uses the linear approach: it uses two buffer queues for frames received out of turn and forwards request_frame calls to the input where a frame is necessary.
* | lavfi: add a generic API for buffer queues.Nicolas George2012-05-31
| |
* | sink_buffer: guard against NULL frames.Nicolas George2012-05-31
| | | | | | | | | | This only happens if some filter somewhere is bogus, but it helps debugging.
* | avfilter: use designated initializer for classPaul B Mahol2012-05-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi: use getter/setter functions for AVFrame.pkt_posMichael Niedermayer2012-05-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: Fill linesize, sample_rate and channel_layout fields in ↵Robert Nagy2012-05-28
| | | | | | | | | | | | avfilter_fill_frame_from_audio_buffer_ref. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lswsutils: fix "ncompatible pointer type" warningMichael Niedermayer2012-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfutils: fix incompatible pointer type warningMichael Niedermayer2012-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_aresample: fix pts, they where off by a packet in the -async >0 case.Michael Niedermayer2012-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_aresample: fix request_frame()Michael Niedermayer2012-05-26
| | | | | | | | | | | | Fixes part of Ticket1341 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavfilter: export ff_default_query_formats()Michael Niedermayer2012-05-25
| | | | | | | | | | | | Its needed for fate on shared versioned .so Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/pixdesctest: use AVPALETTE_SIZE macroStefano Sabatini2012-05-25
| |
* | lavfi/pixdesctest: fix SAME -> SAME memcpyStefano Sabatini2012-05-25
| | | | | | | | | | | | Fix pixdesctest output with pal8 input. X-Cola-Count: +(10+i*PI)l
* | lavfi/hflip: copy palette data in start_frame()Stefano Sabatini2012-05-25
| | | | | | | | Fix trac ticket #1116.
* | lavfi/aresample: print channel layouts and formats along with the rate.Clément Bœsch2012-05-25
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Return a proper error code instead of -1 rtmp: Check malloc calls rtmp: Check ff_rtmp_packet_create calls lavfi: add audio mix filter flvdec: Make sure sample_rate is set to the updated value tqi: Pass errors from the MB decoder Conflicts: Changelog doc/filters.texi libavcodec/eatqi.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add audio mix filterJustin Ruggles2012-05-23
| |
* | lavfi/video: add avfilter.h include to fix make checkheaders.Clément Bœsch2012-05-24
| |
* | lavfutils: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git blame: 77 Stefano Sabatini 1 Michael Niedermayer Initial commit: commit 2f83681c79a7419bec14ed6f40bf3a69b5dd16c2 Author: Stefano Sabatini <stefasab@gmail.com> Date: Sat Mar 10 14:01:28 2012 +0100 lavfi: port libmpcodecs remove-logo filter 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. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/video: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git blame: 132 Stefano Sabatini 77 Vitor Sessak 49 Michael Niedermayer 24 Anton Khirnov 22 S.N. Hemanth Meenakshisundaram 13 Bobby Bingham 7 Luca Barbato 2 Nicolas George 2 Alex Converse 1 Diego Elio Pettenò Initial commit not traced as this file was split out. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | drawutils: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git blame: 423 Nicolas George 86 Stefano Sabatini 19 Michael Niedermayer 1 Reimar Döffinger Initial commit: commit bcfd9e821b6083e9a98b8e5da4de0a4fbf22923b Author: Stefano Sabatini <stefano.sabatini-lala@poste.it> Date: Sun Feb 20 23:42:17 2011 +0100 lavfi: add drawutils Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_fps: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only commit: commit 54c5dd89e3125c1f363fe8f95d2837a796967c6e Author: Anton Khirnov <anton@khirnov.net> Date: Wed May 9 14:08:21 2012 +0200 lavfi: Add fps filter. Partially based on a patch by Robert Nagy <ronag89@gmail.com> also see [FFmpeg-devel] [PATCH 07/10] vf_fps: fix copyright Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_fps: license cleanupMichael Niedermayer2012-05-24
| | | | | | | | | | | | The original patch was sent with FFmpeg in the license header. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/buffer.c: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git blame: 75 Anton Khirnov 72 Michael Niedermayer 39 Stefano Sabatini 23 S.N. Hemanth Meenakshisundaram 9 Vitor Sessak 6 Robert Nagy 2 Diego Biurrun 1 Andrey Utkin Note: commit ab165047a6142ca0c8c333c36f4ebb96477622d7 Author: Anton Khirnov <anton@khirnov.net> Date: Fri Apr 27 17:27:40 2012 +0200 lavfi: add a function for copying properties from AVFilterBufferRef->AVFrame Based on a commit by Stefano Sabatini <stefano.sabatini-lala@poste.it> commit 4a1ac8c43fcf526b249c3409f1ba54755143a224 Author: Anton Khirnov <anton@khirnov.net> Date: Thu May 10 07:58:11 2012 +0200 lavfi: move buffer management function to a separate file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/avcodec.c: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git blame: 45 Stefano Sabatini 23 Clément Bœsch 4 Michael Niedermayer 3 Robert Nagy 3 Nicolas George 2 Roger Pau Monné Initial commit: commit 566666caf3a09d6254edaa99d222eddb6fe2986b Author: Stefano Sabatini <stefano.sabatini-lala@poste.it> Date: Sun May 1 14:47:05 2011 +0200 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asrc_anullsrc: fix copyrightMichael Niedermayer2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git blame says: 109 Stefano Sabatini 7 Clément Bœsch 2 Reimar Döffinger 2 Michael Niedermayer 1 Reinhard Tartler 1 Mans Rullgard Initial commit: commit 1ee410f330d3b57b0ea1ccb915977f2ba4d99815 Author: Stefano Sabatini <stefano.sabatini-lala@poste.it> Date: Sat Sep 25 01:56:58 2010 +0000 Add asrc_anullsrc - null audio source. Based on a patch by "S.N. Hemanth Meenakshisundaram" smeenaks!ucsd!edu. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>