ffmpeg/libavfilter
Michael Niedermayer 6e9dbee7c6 Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'
* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
	libavfilter/vf_format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:46:56 +02:00
..
libmpcodecs libmpcodecs/vf_uspp: check avcodec_open() return code 2014-05-11 02:13:28 +02:00
x86
Makefile build: move ebur128 swr dep to configure. 2014-05-13 23:13:44 +02:00
aeval.c avfilter/aeval: silence "may be used uninitialized" warning 2014-05-07 16:15:50 +02:00
af_aconvert.c
af_adelay.c
af_aecho.c
af_afade.c
af_aformat.c
af_amerge.c
af_amix.c
af_anull.c
af_apad.c
af_aphaser.c
af_aresample.c
af_asetnsamples.c
af_asetrate.c
af_ashowinfo.c
af_astats.c
af_astreamsync.c
af_asyncts.c
af_atempo.c
af_biquads.c
af_bs2b.c avfilter/af_bs2b: Fix incompatible pointer type warnings 2014-05-06 01:01:02 +02:00
af_channelmap.c
af_channelsplit.c
af_compand.c avfilter/af_compand: Silence "may be used uninitialized" warning 2014-05-08 06:53:16 +02:00
af_earwax.c
af_join.c
af_ladspa.c
af_pan.c
af_replaygain.c
af_resample.c
af_silencedetect.c
af_volume.c
af_volume.h
af_volumedetect.c
all_channel_layouts.inc
allfilters.c Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 2014-05-01 14:14:10 +02:00
asink_anullsink.c
asrc_abuffer.h
asrc_anullsrc.c
asrc_flite.c
asrc_sine.c
audio.c avfilter/audio: use av_mallocz_array() 2014-05-03 20:08:18 +02:00
audio.h
avcodec.c avfilter/avcodec: Use av_mallocz_array() 2014-04-23 21:13:53 +02:00
avcodec.h
avf_avectorscope.c
avf_concat.c
avf_showspectrum.c
avf_showwaves.c
avfilter.c
avfilter.h lavfi/avfilter: clarify avfilter_graph_get_filter() doxygen 2014-04-26 02:16:56 +02:00
avfiltergraph.c Move av_find_best_pix_fmt_of_2() from avcodec to avutil 2014-04-30 23:14:05 +02:00
avfiltergraph.h
avfilterres.rc
bbox.c
bbox.h
buffer.c avfilter/buffer: Use av_malloc_array() 2014-05-12 12:24:41 +02:00
bufferqueue.h
buffersink.c lavfi/buffersink: use av_fifo_alloc_array 2014-05-20 00:00:44 +02:00
buffersink.h
buffersrc.c avcodec/buffersrc: use av_mallocz_array() 2014-05-12 12:24:25 +02:00
buffersrc.h
deshake.h
deshake_opencl.c
deshake_opencl.h
deshake_opencl_kernel.h
drawutils.c
drawutils.h
dualinput.c
dualinput.h
f_ebur128.c
f_interleave.c
f_perms.c
f_select.c avfilter/f_select: fix incompatible pointer type warning 2014-05-05 05:51:50 +02:00
f_sendcmd.c
f_zmq.c
fifo.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
filtfmts.c avfilter/filtfmts: Support dynamically allocated in/outputs 2014-04-21 11:33:17 +02:00
formats.c
formats.h
framesync.c
framesync.h
gradfun.h
graphdump.c avfilter/graphdump: Fix pointer to local outside scope 2014-04-28 04:01:50 +02:00
graphparser.c
internal.h
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
opencl_allkernels.c
opencl_allkernels.h
pthread.c avfilter/pthread: Use av_mallocz_array() 2014-04-22 02:40:20 +02:00
setpts.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
settb.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
split.c
src_movie.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
thread.h
transform.c
transform.h
trim.c
unsharp.h Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
unsharp_opencl.c
unsharp_opencl.h
unsharp_opencl_kernel.h
version.h Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 2014-05-01 14:14:10 +02:00
vf_alphamerge.c
vf_aspect.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_bbox.c
vf_blackdetect.c Add metadata injection to blackdetect 2014-05-24 03:56:42 +02:00
vf_blackframe.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_blend.c
vf_boxblur.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_colorbalance.c
vf_colorchannelmixer.c
vf_colormatrix.c
vf_copy.c
vf_crop.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_cropdetect.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_curves.c avfilter/curves: fix resource leaks. 2014-04-27 11:49:13 +02:00
vf_dctdnoiz.c
vf_decimate.c
vf_dejudder.c
vf_delogo.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_deshake.c avfilter/vf_deshake: dont pass the wrong context into the SAD functions 2014-05-03 22:52:17 +02:00
vf_drawbox.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_drawtext.c lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. 2014-04-29 13:25:59 +02:00
vf_edgedetect.c avfilter/edgedetect: reuse already defined ctx. 2014-05-17 14:16:04 +02:00
vf_elbg.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_extractplanes.c
vf_fade.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_field.c
vf_fieldmatch.c
vf_fieldorder.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_format.c Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece' 2014-05-27 02:46:56 +02:00
vf_fps.c lavfi/vf_fps: use av_fifo_alloc_array 2014-05-20 00:00:44 +02:00
vf_framepack.c
vf_framestep.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_frei0r.c
vf_geq.c
vf_gradfun.c
vf_hflip.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_histeq.c
vf_histogram.c
vf_hqdn3d.c avfilter/vf_hqdn3: use av_malloc_array() 2014-05-14 06:17:05 +02:00
vf_hqdn3d.h Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_hue.c
vf_idet.c
vf_il.c
vf_interlace.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_kerndeint.c
vf_libopencv.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_lut.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_lut3d.c avfilter/lut3d: move the scale calc out of the inner loop. 2014-05-14 07:51:10 +02:00
vf_mcdeint.c
vf_mergeplanes.c
vf_mp.c
vf_mpdecimate.c
vf_noise.c
vf_null.c
vf_overlay.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_owdenoise.c
vf_pad.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_perspective.c
vf_phase.c avfilter/phase: make the main loop readable. 2014-05-08 23:58:34 +02:00
vf_pixdesctest.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_pp.c
vf_psnr.c
vf_pullup.c
vf_pullup.h
vf_removelogo.c avfilter/vf_removelogo: use av_malloc_array() 2014-05-14 06:17:27 +02:00
vf_rotate.c
vf_sab.c
vf_scale.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_separatefields.c
vf_setfield.c
vf_showinfo.c avfilter/vf_showinfo: also calculate and show mean and standard deviation 2014-05-03 06:02:42 +02:00
vf_shuffleplanes.c
vf_smartblur.c
vf_spp.c
vf_spp.h
vf_stereo3d.c
vf_subtitles.c lavfi/subtitles: introduce stream_index 2014-05-01 12:52:33 +02:00
vf_super2xsai.c
vf_swapuv.c
vf_telecine.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c
vf_transpose.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_unsharp.c
vf_vflip.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
vf_vidstabdetect.c
vf_vidstabtransform.c
vf_vignette.c avfilter/vignette: reindent after previous commit. 2014-05-16 06:53:36 +02:00
vf_w3fdif.c
vf_yadif.c vfilter/vf_yadif: fix request_frame after 0f9f24c9 2014-05-03 16:14:32 +02:00
video.c
video.h
vidstabutils.c
vidstabutils.h
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c avfilter/vsrc_mandelbrot: use av_malloc_array() 2014-05-15 01:54:36 +02:00
vsrc_mptestsrc.c
vsrc_testsrc.c Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
yadif.h