Michael Niedermayer 1ea28ffc4d Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e' ...

* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

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

2013-10-24 10:35:39 +02:00

..

libmpcodecs

avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration

2013-10-24 07:44:23 +00:00

x86

Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

2013-10-24 10:35:39 +02:00

af_aconvert.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_adelay.c

avfilter: add adelay filter

2013-09-16 14:33:07 +00:00

af_aecho.c

avfilter/af_aecho & af_compand: use extended_data

2013-09-15 12:10:12 +00:00

af_afade.c

avfilter/af_afade: use the name 's' for the pointer to the private context

2013-10-02 11:37:52 +00:00

af_aformat.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_amerge.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_amix.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_anull.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_apad.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_aphaser.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_aresample.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_asetnsamples.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_asetrate.c

lavfi: add asetrate filter.

2013-04-21 15:20:50 +02:00

af_ashowinfo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_astats.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_astreamsync.c

lavfi: remove now unused args parameter from AVFilter.init and init_opaque

2013-04-12 11:54:39 +02:00

af_asyncts.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_atempo.c

libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484

2013-04-21 10:46:52 +02:00

af_biquads.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_channelmap.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_channelsplit.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_compand.c

avfilter/af_aecho & af_compand: use extended_data

2013-09-15 12:10:12 +00:00

af_earwax.c

avfilter/af_earwax: Fix out of array accesses on odd packets

2013-07-10 16:46:13 +02:00

af_join.c

avfilter/af_join: remove now unnecessary goto

2013-10-08 12:40:33 +00:00

af_ladspa.c

avfilter/af_ladspa: set output channel layout for passthrough case

2013-09-27 12:51:08 +00:00

af_pan.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_replaygain.c

avfilter: replaygain scanner

2013-10-21 19:56:55 +00:00

af_resample.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_silencedetect.c

avfilter/af_silencedetect: support more sample formats

2013-10-05 11:59:34 +00:00

af_volume.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_volume.h

…

af_volumedetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

all_channel_layouts.inc

…

allfilters.c

avfilter: replaygain scanner

2013-10-21 19:56:55 +00:00

asink_anullsink.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

asrc_abuffer.h

…

asrc_aevalsrc.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

asrc_anullsrc.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

asrc_flite.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

asrc_sine.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

audio.c

Merge remote-tracking branch 'qatar/master'

2013-06-19 08:27:35 +02:00

audio.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avcodec.c

lavfi/avcodec: deprecate remainders of the avcodec glue code

2013-03-16 17:04:36 +01:00

avcodec.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

avf_avectorscope.c

avfilter/avf_avectorscope: improve description

2013-09-14 12:11:22 +00:00

avf_concat.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

avf_showspectrum.c

avfilter/avf_showspectrum: use the name 's' for the pointer to the private context

2013-10-02 11:37:53 +00:00

avf_showwaves.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

avfilter.c

avfilter/ff_insert_pad: fix order of operations

2013-10-21 16:43:25 +02:00

avfilter.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

avfiltergraph.c

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

avfiltergraph.h

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

2013-04-11 23:50:39 +02:00

bbox.c

…

bbox.h

…

buffer.c

Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

2013-08-01 11:36:54 +02:00

bufferqueue.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

buffersink.c

avfilter/buffersink: try to fix AV_NOPTS_VALUE

2013-10-09 16:33:18 +02:00

buffersink.h

lavfi/buffersink: fix header.

2013-03-17 12:31:25 +01:00

buffersrc.c

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

2013-08-03 10:08:30 +02:00

buffersrc.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

deshake_opencl_kernel.h

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

2013-05-10 12:44:04 +02:00

deshake_opencl.c

lavu: add FF_CEIL_RSHIFT and use it in various places.

2013-05-09 16:59:42 +02:00

deshake_opencl.h

deshake opencl based on comments on 20130402 3rd

2013-04-02 15:57:44 +02:00

deshake.h

deshake opencl based on comments on 20130402 3rd

2013-04-02 15:57:44 +02:00

drawutils.c

lavfi/drawutils: set subsampling for rgb too

2013-07-14 17:59:25 +00:00

drawutils.h

…

dualinput.c

avfilter/dualinput: simplify

2013-09-30 08:47:40 +00:00

dualinput.h

avfilter/dualinput: simplify

2013-09-30 08:47:40 +00:00

f_ebur128.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_interleave.c

avfilter/f_interleave: use the name 's' for the pointer to the private context

2013-10-05 19:16:55 +00:00

f_perms.c

avfilter: Filter options that are used for both video and audio should have both flags

2013-04-12 15:45:28 +02:00

f_select.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_sendcmd.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_settb.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_zmq.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

fifo.c

avfilter: remove redundant .get_(audio/video)_buffer initializations

2013-09-07 18:20:16 +00:00

filtfmts.c

avfilter/filtfmts: fix use of deprecated symbols

2013-08-25 19:33:44 +02:00

formats.c

avfilter: remove ff_copy_int*_list

2013-08-16 16:07:29 +02:00

formats.h

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

2013-05-18 11:46:09 +02:00

framesync.c

lavfi: add an API to synchronize multiple video inputs.

2013-09-23 09:49:37 +02:00

framesync.h

lavfi: add an API to synchronize multiple video inputs.

2013-09-23 09:49:37 +02:00

gradfun.h

Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

2013-10-23 12:14:49 +02:00

graphdump.c

avfilter/graphdump: fix use of deprecated symbols

2013-08-25 19:33:44 +02:00

graphparser.c

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

internal.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

lavfutils.c

avfilter/lavfutils: fix memleak of avpacket

2013-10-12 11:52:10 +02:00

lavfutils.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

libavfilter.v

…

lswsutils.c

avfilter/lswsutils: dont override the default scaler

2013-10-07 13:28:13 +02:00

lswsutils.h

…

Makefile

avfilter: replaygain scanner

2013-10-21 19:56:55 +00:00

opencl_allkernels.c

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

2013-05-10 12:44:04 +02:00

opencl_allkernels.h

deshake opencl based on comments on 20130402 3rd

2013-04-02 15:57:44 +02:00

pthread.c

lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups

2013-10-22 17:05:26 +01:00

setpts.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

split.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

src_movie.c

avfilter/src_movie: Fix handling of packet size for video

2013-06-26 13:46:19 +02:00

thread.h

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

transform.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

transform.h

…

trim.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

unsharp_opencl_kernel.h

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

2013-05-10 12:44:04 +02:00

unsharp_opencl.c

lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

2013-05-09 16:59:43 +02:00

unsharp_opencl.h

lavfi/unsharp: add opencl unsharp filter

2013-04-26 03:05:26 +02:00

unsharp.h

lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

2013-05-09 16:59:43 +02:00

version.h

avfilter: replaygain scanner

2013-10-21 19:56:55 +00:00

vf_alphamerge.c

avfilter: remove redundant .get_(audio/video)_buffer initializations

2013-09-07 18:20:16 +00:00

vf_aspect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_bbox.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_blackdetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_blackframe.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_blend.c

avfilter/dualinput: simplify

2013-09-30 08:47:40 +00:00

vf_boxblur.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_colorbalance.c

lavfi: cosmetics: fix vertical alignment for pads in some filters

2013-05-14 15:31:56 +00:00

vf_colorchannelmixer.c

lavfi: cosmetics: fix vertical alignment for pads in some filters

2013-05-14 15:31:56 +00:00

vf_colormatrix.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_copy.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_crop.c

lavfi/pad,crop,scale: remove options description from filter description

2013-09-21 12:50:02 +00:00

vf_cropdetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_curves.c

lavfi: cosmetics: fix vertical alignment for pads in some filters

2013-05-14 15:31:56 +00:00

vf_dctdnoiz.c

lavfi/dctdnoiz: move DC normalization out of loops.

2013-05-26 22:41:02 +02:00

vf_decimate.c

avfilter/vf_decimate: add gray16 and yuv440p

2013-09-19 17:53:05 +00:00

vf_delogo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_deshake.c

avfilter/vf_deshake: fix block_contrast() lower brightness value

2013-10-07 22:05:14 +02:00

vf_drawbox.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_drawtext.c

avfilter/vf_drawtext: remove dead initialization

2013-10-07 08:40:17 +00:00

vf_edgedetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_extractplanes.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vf_fade.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_field.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_fieldmatch.c

avfilter: fix plane validity checks

2013-08-03 19:15:46 +02:00

vf_fieldorder.c

Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'

2013-10-22 19:26:42 +02:00

vf_format.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_fps.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_framestep.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_frei0r.c

avfilter/vf_frei0r: fix out of array read

2013-10-04 11:16:35 +02:00

vf_geq.c

Update copyrights where my email appears with the new one.

2013-09-03 20:42:24 +02:00

vf_gradfun.c

Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

2013-10-23 12:14:49 +02:00

vf_hflip.c

avfilter/vf_hflip: support slice threading

2013-09-30 13:08:55 +00:00

vf_histeq.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_histogram.c

avfilter/vf_histogram: use const for variables that are not supposed to change

2013-10-04 16:48:19 +00:00

vf_hqdn3d.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_hqdn3d.h

Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'

2013-04-10 21:14:30 +02:00

vf_hue.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_idet.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_il.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_interlace.c

Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

2013-10-03 11:16:57 +02:00

vf_kerndeint.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_libopencv.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_lut3d.c

avfilter/dualinput: simplify

2013-09-30 08:47:40 +00:00

vf_lut.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_mcdeint.c

avfilter/vf_mcdeint: free frame on error

2013-06-03 15:41:29 +02:00

vf_mp.c

lavfi/mp: remove mp=qp

2013-09-19 15:53:45 +00:00

vf_mpdecimate.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_noise.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vf_null.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_overlay.c

avfilter/dualinput: simplify

2013-09-30 08:47:40 +00:00

vf_owdenoise.c

Update copyrights where my email appears with the new one.

2013-09-03 20:42:24 +02:00

vf_pad.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_perspective.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_phase.c

avfilter/vf_phase: remove dead initialization

2013-10-07 08:28:00 +00:00

vf_pixdesctest.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_pp.c

lavfi/pp: set out frame size.

2013-06-08 23:23:30 +02:00

vf_psnr.c

avfilter/dualinput: simplify

2013-09-30 08:47:40 +00:00

vf_pullup.c

avfilter/vf_pullup: do not ignore frame field order

2013-10-03 02:43:20 +00:00

vf_pullup.h

avfilter/vf_pullup: remove junk_down nonsense

2013-09-18 12:47:57 +00:00

vf_removelogo.c

avfilter/vf_removelogo: fix pixel pointer so it points where its intended

2013-10-12 11:36:55 +02:00

vf_rotate.c

avfilter/vf_rotate: support slice threading

2013-09-30 13:08:55 +00:00

vf_sab.c

vf_sab: Fix memleak

2013-06-10 22:00:43 +02:00

vf_scale.c

avfilter/vf_scale: Correct vf_scale mappings from arguments to color range

2013-10-23 15:44:31 +02:00

vf_separatefields.c

avfilter/vf_separatefields: do not reset pts to 0

2013-10-12 15:10:19 +00:00

vf_setfield.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_showinfo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_smartblur.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_spp.c

Update copyrights where my email appears with the new one.

2013-09-03 20:42:24 +02:00

vf_spp.h

lavfi: add spp filter.

2013-06-14 01:27:22 +02:00

vf_stereo3d.c

avfilter/vf_stereod3d: add const qualifiers to ana_convert()

2013-09-16 12:37:29 +00:00

vf_subtitles.c

lavfi/subtitles: zero-init AVSubtitle.

2013-04-25 00:56:38 +02:00

vf_super2xsai.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_swapuv.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_telecine.c

avfilter/vf_telecine: remove redudant av_frame_copy_props()

2013-09-18 19:17:34 +00:00

vf_thumbnail.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_tile.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_tinterlace.c

avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p

2013-09-21 12:48:24 +00:00

vf_transpose.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_unsharp.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_vflip.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_vidstabdetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_vidstabtransform.c

avfilter/vidstabtransform: update optzoom range values for recent vid.stab update.

2013-09-27 16:48:31 +00:00

vf_vignette.c

avfilter: fix plane validity checks

2013-08-03 19:15:46 +02:00

vf_w3fdif.c

avfilter/vf_w3fdif: do not reset pts to 0

2013-10-10 15:08:55 +00:00

vf_yadif.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

video.c

avfilter/video: remove commented out cruft

2013-09-13 19:17:56 +00:00

video.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vidstabutils.c

lavfi/vidstab: miscelenaous cosmetics and typo fixes.

2013-04-24 18:30:42 +02:00

vidstabutils.h

lavfi: add video stabilization plugins using vid.stab library

2013-04-24 18:30:42 +02:00

vsink_nullsink.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_cellauto.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vsrc_life.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vsrc_mandelbrot.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vsrc_mptestsrc.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vsrc_testsrc.c

avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly

2013-10-12 18:40:15 +00:00

yadif.h

yadif: restore speed of the C filtering code

2013-05-14 09:23:55 +02:00