ffmpeg/libavfilter
Michael Niedermayer ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:44:56 +01:00
..
libmpcodecs Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
x86 Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de' 2013-01-14 14:43:32 +01:00
Makefile afade filter 2013-01-21 15:20:42 +00:00
af_aconvert.c
af_afade.c afade filter 2013-01-21 15:20:42 +00:00
af_aformat.c
af_amerge.c
af_amix.c
af_anull.c
af_apad.c
af_aresample.c lavfi/aresample: fix style 2012-12-26 11:56:35 +01:00
af_asetnsamples.c
af_ashowinfo.c
af_astreamsync.c
af_asyncts.c
af_atempo.c
af_channelmap.c
af_channelsplit.c
af_earwax.c
af_join.c
af_pan.c
af_resample.c
af_silencedetect.c
af_volume.c
af_volume.h
af_volumedetect.c
all_channel_layouts.inc
allfilters.c afade filter 2013-01-21 15:20:42 +00:00
asink_anullsink.c
asrc_abuffer.h
asrc_aevalsrc.c lavfi/aevalsrc: try to honor specified duration 2013-01-12 17:26:35 +01:00
asrc_anullsrc.c
asrc_flite.c
audio.c lavfi: merge all filtering code into ff_filter_frame. 2013-01-01 15:19:04 +01:00
audio.h
avcodec.c lavfi/avcodec: fix typo 2013-01-01 12:57:07 +00:00
avcodec.h
avf_concat.c avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use. 2012-12-29 18:56:33 +01:00
avf_showspectrum.c
avf_showwaves.c lavfi/showwaves: fix check on showwaves->outpicref 2013-01-22 20:34:29 +01:00
avfilter.c lavfi: fix null checking in avfilter_config_links() 2013-01-21 00:07:00 +01:00
avfilter.h lavfi/avfilter: remove now unused {src,cur,out}_buf. 2013-01-06 04:14:56 +01:00
avfiltergraph.c Replace references to "que" with the appropriate word. 2013-01-03 00:21:47 +01:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c
bufferqueue.h
buffersink.c
buffersink.h
buffersrc.c
buffersrc.h
drawutils.c lavfi/drawutils: fix blending computation in blend_line function 2013-01-05 13:08:02 +01:00
drawutils.h lavfi/drawutils: fix typo 2013-01-05 05:21:44 +01:00
f_ebur128.c lavfi: EBU R.128 irregular time 2013-01-19 03:13:24 +01:00
f_select.c
f_sendcmd.c
f_setpts.c
f_settb.c
fifo.c
filtfmts.c
formats.c
formats.h
gradfun.h
graphdump.c
graphparser.c
internal.h internal.h: remove start/end_frame from AVFilterPad 2013-01-05 23:36:09 +01:00
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
sink_buffer.c lavfi/sink_buffer: switch to filter_frame. 2012-12-30 18:29:57 +01:00
split.c
src_buffer.c lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels. 2013-01-01 02:01:28 +01:00
src_movie.c
transform.c
transform.h
version.h afade filter 2013-01-21 15:20:42 +00:00
vf_alphaextract.c
vf_alphamerge.c
vf_aspect.c
vf_ass.c
vf_bbox.c
vf_blackdetect.c
vf_blackframe.c
vf_boxblur.c
vf_colormatrix.c
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_decimate.c Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
vf_delogo.c
vf_deshake.c vf_deshake: fix strict aliassing errors 2012-12-29 20:00:48 +01:00
vf_drawbox.c
vf_drawtext.c
vf_edgedetect.c
vf_fade.c vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha 2013-01-18 22:51:05 +00:00
vf_field.c
vf_fieldorder.c
vf_format.c
vf_fps.c Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e' 2013-01-16 11:44:45 +01:00
vf_framestep.c
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-12-31 14:20:01 +01:00
vf_geq.c
vf_gradfun.c lavfi/gradfun: support YUV440P 2013-01-13 13:23:30 +00:00
vf_hflip.c
vf_histeq.c lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-12-31 14:20:01 +01:00
vf_hue.c
vf_idet.c vf_idet: fix type of stats 2012-12-26 17:27:28 +01:00
vf_kerndeint.c lavfi/kerndeint: remove unused pixel_step. 2013-01-06 18:59:15 +01:00
vf_libopencv.c
vf_lut.c lavfi/lut: use ff_fill_rgba_map() 2013-01-01 17:07:57 +00:00
vf_mp.c vf_mp: fix 'discards const qualifier from pointer target type' 2012-12-28 17:00:01 +01:00
vf_null.c
vf_overlay.c lavfi/vf_overlay: check that filter_frame does not return EAGAIN. 2013-01-10 21:55:02 +01:00
vf_pad.c
vf_pixdesctest.c
vf_pp.c
vf_removelogo.c
vf_scale.c lavfi/scale: remove usage of link->cur_buf. 2012-12-26 21:30:45 +01:00
vf_setfield.c
vf_showinfo.c
vf_smartblur.c
vf_super2xsai.c
vf_swapuv.c lavfi/swapuv: support all planar yuv pixel formats 2013-01-23 16:13:23 +00:00
vf_thumbnail.c
vf_tile.c lavfi/tile: small align cosmetics. 2012-12-26 21:32:38 +01:00
vf_tinterlace.c vf_tinterlace: fix logical/bit op mixup 2013-01-06 04:38:53 +01:00
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c lavfi/yadif: fix shorthand/option mismatch 2013-01-10 11:01:14 +01:00
video.c lavfi: merge all filtering code into ff_filter_frame. 2013-01-01 15:19:04 +01:00
video.h libavfilter/video.h: remove unused things related to the start/slice/end API 2013-01-05 23:36:09 +01:00
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c vsrc_testsrc: Fix assignments in if() 2013-01-14 05:05:40 +01:00
yadif.h lavfi/yadif: add support to named constants 2013-01-04 11:48:54 +01:00