ffmpeg/libavfilter
Michael Niedermayer ebb21887b8 Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
	libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 19:16:39 +02:00
..
libmpcodecs
x86 Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' 2014-04-05 19:16:39 +02:00
aeval.c
af_aconvert.c
af_adelay.c avfilter: remove superflous lines 2014-02-26 16:37:59 +00:00
af_aecho.c avfilter: remove superflous lines 2014-02-26 16:37:59 +00:00
af_afade.c
af_aformat.c
af_amerge.c
af_amix.c
af_anull.c
af_apad.c avfilter: remove superflous lines 2014-02-26 16:37:59 +00:00
af_aphaser.c
af_aresample.c
af_asetnsamples.c
af_asetrate.c
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2014-04-05 00:42:47 +02:00
af_astats.c
af_astreamsync.c
af_asyncts.c
af_atempo.c lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
af_biquads.c
af_channelmap.c Merge commit 'e843612695007cc623813073754c651ab43021f7' 2014-03-16 14:18:01 +01:00
af_channelsplit.c
af_compand.c af_compand: replace strtok_r() with av_get_token() 2014-02-28 21:55:46 +01:00
af_earwax.c
af_join.c
af_ladspa.c
af_pan.c lavfi/pan: use extended_data instead of data. 2014-02-19 11:29:15 +01:00
af_replaygain.c
af_resample.c Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d' 2014-02-24 21:46:00 +01:00
af_silencedetect.c
af_volume.c Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06' 2014-04-05 00:16:53 +02:00
af_volume.h Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06' 2014-04-05 00:16:53 +02:00
af_volumedetect.c
all_channel_layouts.inc
allfilters.c Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
asink_anullsink.c
asrc_abuffer.h
asrc_anullsrc.c
asrc_flite.c
asrc_sine.c
audio.c
audio.h
avcodec.c
avcodec.h
avf_avectorscope.c
avf_concat.c
avf_showspectrum.c
avf_showwaves.c
avfilter.c Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb' 2014-03-06 12:38:09 +01:00
avfilter.h avfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props 2014-04-03 13:49:13 +02:00
avfiltergraph.c avfilter: make avfilter_graph_get_filter use const string name 2014-03-14 23:18:59 +01:00
avfiltergraph.h
avfilterres.rc
bbox.c
bbox.h
buffer.c avfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props 2014-04-03 13:49:13 +02:00
bufferqueue.h
buffersink.c
buffersink.h Merge remote-tracking branch 'qatar/master' 2014-02-15 04:05:04 +01:00
buffersrc.c
buffersrc.h Merge remote-tracking branch 'qatar/master' 2014-02-15 04:05:04 +01:00
deshake_opencl_kernel.h
deshake_opencl.c
deshake_opencl.h
deshake.h
drawutils.c
drawutils.h
dualinput.c
dualinput.h
f_ebur128.c
f_interleave.c
f_perms.c
f_select.c
f_sendcmd.c
f_zmq.c
fifo.c
filtfmts.c
formats.c
formats.h
framesync.c
framesync.h
gradfun.h
graphdump.c
graphparser.c
internal.h
lavfutils.c avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream 2014-03-28 17:29:26 +01:00
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile Merge remote-tracking branch 'qatar/master' 2014-04-02 18:25:15 +02:00
opencl_allkernels.c
opencl_allkernels.h
pthread.c
setpts.c
settb.c Merge remote-tracking branch 'qatar/master' 2014-04-02 18:25:15 +02:00
split.c
src_movie.c avfilter/src_movie: Check that the pixel format hasnt changed 2014-03-18 03:59:20 +01:00
thread.h
transform.c
transform.h
trim.c
unsharp_opencl_kernel.h
unsharp_opencl.c
unsharp_opencl.h
unsharp.h
version.h Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
vf_alphamerge.c
vf_aspect.c
vf_bbox.c
vf_blackdetect.c
vf_blackframe.c
vf_blend.c
vf_boxblur.c
vf_colorbalance.c
vf_colorchannelmixer.c
vf_colormatrix.c Fix FSF address in colormatrix and libzvbi license headers. 2014-02-22 11:17:56 +01:00
vf_copy.c Merge remote-tracking branch 'qatar/master' 2014-02-24 10:47:47 +01:00
vf_crop.c
vf_cropdetect.c
vf_curves.c avfilter/curves: support slice threading. 2014-02-13 14:35:10 +01:00
vf_dctdnoiz.c
vf_decimate.c
vf_dejudder.c lavfi: adding dejudder filter to remove judder produced by partially telecined material. 2014-02-16 17:43:58 +01:00
vf_delogo.c
vf_deshake.c
vf_drawbox.c
vf_drawtext.c
vf_edgedetect.c
vf_elbg.c
vf_extractplanes.c
vf_fade.c
vf_field.c
vf_fieldmatch.c
vf_fieldorder.c
vf_format.c
vf_fps.c avfilter/vf_fps: fix rounding error accumulation 2014-02-20 02:36:02 +01:00
vf_framepack.c
vf_framestep.c
vf_frei0r.c vf_frei0r: fix missing end of line character 2014-03-04 18:27:09 +01:00
vf_geq.c
vf_gradfun.c avfilter: Add missing emms_c when needed 2014-03-05 11:00:05 +01:00
vf_hflip.c
vf_histeq.c
vf_histogram.c
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2014-03-05 13:51:44 +01:00
vf_hqdn3d.h
vf_hue.c
vf_idet.c
vf_il.c
vf_interlace.c Merge remote-tracking branch 'qatar/master' 2014-02-19 16:16:41 +01:00
vf_kerndeint.c
vf_libopencv.c
vf_lut3d.c avfilter/lut3d: support slice threading. 2014-02-13 13:39:23 +01:00
vf_lut.c
vf_mcdeint.c
vf_mergeplanes.c
vf_mp.c
vf_mpdecimate.c
vf_noise.c
vf_null.c
vf_overlay.c
vf_owdenoise.c
vf_pad.c
vf_perspective.c
vf_phase.c
vf_pixdesctest.c
vf_pp.c
vf_psnr.c
vf_pullup.c avfilter/vf_pullup: fix gray8 2014-03-31 03:22:20 +02:00
vf_pullup.h
vf_removelogo.c
vf_rotate.c
vf_sab.c
vf_scale.c
vf_separatefields.c
vf_setfield.c
vf_showinfo.c Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab' 2014-03-24 15:32:48 +01:00
vf_shuffleplanes.c avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 2014-03-06 16:58:24 +01:00
vf_smartblur.c
vf_spp.c
vf_spp.h
vf_stereo3d.c
vf_subtitles.c
vf_super2xsai.c
vf_swapuv.c
vf_telecine.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2) 2014-03-16 17:25:54 +01:00
vf_transpose.c Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3' 2014-03-25 19:17:38 +01:00
vf_unsharp.c
vf_vflip.c
vf_vidstabdetect.c
vf_vidstabtransform.c
vf_vignette.c
vf_w3fdif.c
vf_yadif.c
video.c
video.h
vidstabutils.c
vidstabutils.h
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h