Michael Niedermayer 6ca0a976b2 Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f' ...

* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-19 18:30:37 +02:00

..

libmpcodecs

…

x86

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

aeval.c

…

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

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

…

af_biquads.c

…

af_channelmap.c

…

af_channelsplit.c

…

af_compand.c

…

af_earwax.c

…

af_join.c

…

af_ladspa.c

…

af_pan.c

…

af_replaygain.c

…

af_resample.c

…

af_silencedetect.c

…

af_volume.c

Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'

2014-04-13 14:39:51 +02:00

af_volume.h

Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'

2014-04-13 14:39:51 +02:00

af_volumedetect.c

…

all_channel_layouts.inc

…

allfilters.c

libavfilter: Add asettb filter for setting timebase for audio

2014-04-10 12:52:19 +02: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

…

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

…

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

buffersink.h

…

buffersrc.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

buffersrc.h

…

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

f_sendcmd.c

…

f_zmq.c

…

fifo.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

filtfmts.c

Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

2014-04-19 18:30:37 +02:00

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

libavfilter: Add asettb filter for setting timebase for audio

2014-04-10 12:52:19 +02:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

…

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_opencl_kernel.h

…

unsharp_opencl.c

…

unsharp_opencl.h

…

unsharp.h

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

version.h

Merge remote-tracking branch 'qatar/master'

2014-04-10 15:08:04 +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

…

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

avfilter/vf_colormatrix: fix memleak on error

2014-04-08 01:25:00 +02:00

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

…

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: fix loss of precission with odd resolutions

2014-04-16 03:44:57 +02:00

vf_drawbox.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_drawtext.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_edgedetect.c

…

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 '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_fps.c

…

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

…

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_lut3d.c

…

vf_lut.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_mcdeint.c

…

vf_mergeplanes.c

…

vf_mp.c

…

vf_mpdecimate.c

…

vf_noise.c

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00

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

…

vf_pixdesctest.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

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

avfilter/vf_rotate: make int*90° rotates suck less speedwise

2014-04-19 01:23:23 +02:00

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

lavfi: name anonymous structs

2014-04-19 16:20:57 +02:00

vf_shuffleplanes.c

…

vf_smartblur.c

…

vf_spp.c

…

vf_spp.h

…

vf_stereo3d.c

…

vf_subtitles.c

lavfi/subtitles: load attached fonts to libass.

2014-04-13 12:06:24 +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

lavfi: name anonymous structs

2014-04-19 16:20:57 +02:00

vf_vflip.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

yadif.h

…