ffmpeg/libavfilter
Michael Niedermayer be2c0adc96 Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
  build: avfilter: Remove duplicate compilation entry for vf_scale

Conflicts:
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:39:03 +01:00
..
libmpcodecs lavfi: remove mp=denoise3d filter. 2012-12-11 04:28:08 +01:00
x86 lavfi/gradfun: remove rounding to match C and SSE code. 2012-12-19 03:13:25 +01:00
Makefile Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885' 2012-12-21 17:39:03 +01:00
af_aconvert.c lavfi/af_aconvert: update audio->channels. 2012-12-20 17:01:35 +01:00
af_aformat.c
af_amerge.c
af_amix.c
af_anull.c
af_apad.c af_apad: remove unneeded av_opt_free 2012-12-18 17:31:01 +01:00
af_aresample.c lavfi: add a channels field to AVFilterLink. 2012-12-20 13:03:41 +01:00
af_asetnsamples.c
af_ashowinfo.c
af_astreamsync.c
af_asyncts.c Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd' 2012-12-14 15:56:56 +01:00
af_atempo.c
af_channelmap.c
af_channelsplit.c
af_earwax.c
af_join.c
af_pan.c lavfi: add a channels field to AVFilterLink. 2012-12-20 13:03:41 +01:00
af_resample.c
af_silencedetect.c lavfi/silencedetect: use eval builtin to parse dB. 2012-12-06 15:08:38 +01:00
af_volume.c lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c 2012-12-08 15:40:07 +01:00
af_volume.h Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
af_volumedetect.c
all_channel_layouts.inc
allfilters.c avfilter: add apad filter 2012-12-18 16:30:08 +01:00
asink_anullsink.c
asrc_abuffer.h
asrc_aevalsrc.c
asrc_anullsrc.c
asrc_flite.c
audio.c lavfi: add an accessor for ref->audio->channels. 2012-12-20 13:03:41 +01:00
audio.h
avcodec.c avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set 2012-12-12 17:46:05 +01:00
avcodec.h
avf_concat.c
avf_showspectrum.c
avf_showwaves.c
avfilter.c lavfi: remove init and check of rate and layout. 2012-12-20 13:03:42 +01:00
avfilter.h lavfi: add an accessor for ref->audio->channels. 2012-12-20 13:03:41 +01:00
avfiltergraph.c lavfi: add a channels field to AVFilterLink. 2012-12-20 13:03:41 +01:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c ff_copy_buffer_ref: use the channel count 2012-12-12 14:12:47 +01:00
bufferqueue.h
buffersink.c
buffersink.h
buffersrc.c lavfi/buffersrc: remove init of rate and layout. 2012-12-20 13:03:42 +01:00
buffersrc.h
drawutils.c
drawutils.h
f_ebur128.c
f_select.c lavfi/select: fix compilation with avcodec disabled. 2012-12-20 05:17:36 +01:00
f_sendcmd.c lavfi/sendcmd: switch to filter_frame API 2012-12-08 12:10:40 +01:00
f_setpts.c lavfi/setpts: enable debug logs, and improve/extend debug messages 2012-12-19 11:49:54 +01:00
f_settb.c
fifo.c
filtfmts.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
formats.c
formats.h
gradfun.h lavfi/gradfun: support named options. 2012-12-19 03:13:26 +01:00
graphdump.c
graphparser.c
internal.h
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
sink_buffer.c
split.c
src_buffer.c
src_movie.c
transform.c
transform.h
version.h lavfi: add an accessor for ref->audio->channels. 2012-12-20 13:03:41 +01:00
vf_alphaextract.c lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame() 2012-12-07 19:45:34 +01:00
vf_alphamerge.c lavfi/alphamerge: fix leak introduced in 217163eb 2012-12-02 18:04:57 +01:00
vf_aspect.c
vf_ass.c lavfi/subtitles: 10l close codec before format. 2012-12-04 23:56:02 +01:00
vf_bbox.c lavfi/bbox: switch to ff_filter_frame() API 2012-12-02 18:13:49 +01:00
vf_blackdetect.c
vf_blackframe.c
vf_boxblur.c
vf_colormatrix.c
vf_copy.c
vf_crop.c lavfi/crop: free x and y parsed expression objects 2012-12-16 13:16:47 +01:00
vf_cropdetect.c
vf_decimate.c
vf_delogo.c lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props. 2012-12-03 21:47:03 +01:00
vf_deshake.c lavfi/deshake: small align prettifying. 2012-12-06 16:20:31 +01:00
vf_drawbox.c
vf_drawtext.c lavfi/drawtext: make use of outlink variable in filter_frame() 2012-12-06 13:51:27 +01:00
vf_edgedetect.c
vf_fade.c
vf_field.c lavfi/field: switch to filter_frame API 2012-12-06 13:51:34 +01:00
vf_fieldorder.c
vf_format.c
vf_fps.c lavfi/fps: remove parse opt error message. 2012-12-11 18:14:08 +01:00
vf_framestep.c lavfi/framestep: switch to ff_filter_frame API 2012-12-02 15:02:05 +01:00
vf_frei0r.c
vf_geq.c
vf_gradfun.c lavfi/gradfun: small align cosmetics. 2012-12-19 03:22:58 +01:00
vf_hflip.c
vf_hqdn3d.c lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props. 2012-12-03 21:47:03 +01:00
vf_hue.c
vf_idet.c lavfi/idet: switch to filter_frame API 2012-12-08 17:19:17 +01:00
vf_libopencv.c
vf_lut.c
vf_mp.c lavfi: remove mp=denoise3d filter. 2012-12-11 04:28:08 +01:00
vf_null.c
vf_overlay.c lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability 2012-12-15 14:08:42 +01:00
vf_pad.c
vf_pixdesctest.c
vf_removelogo.c lavfi/removelogo: switch to ff_filter_frame. 2012-12-04 02:31:40 +01:00
vf_scale.c
vf_setfield.c lavfi/setfield: add support to named options and introspection 2012-12-08 18:26:32 +01:00
vf_showinfo.c lavfi/showinfo: check plane count before dereferencing. 2012-12-12 02:55:10 +01:00
vf_smartblur.c
vf_super2xsai.c lavfi/vf_super2xsai: fix output ref size. 2012-12-02 17:08:17 +01:00
vf_swapuv.c lavfi/swapuv: switch to filter_frame API 2012-12-08 12:10:34 +01:00
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c vf_tinterlace: default of mode switch is impossible, add assert. 2012-12-11 00:03:23 +01:00
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c
video.c lavfi: drop ff_null_start_frame/end_frame/draw_slice. 2012-12-13 03:38:16 +01:00
video.h lavfi: drop ff_null_start_frame/end_frame/draw_slice. 2012-12-13 03:38:16 +01:00
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h