Michael Niedermayer 9c31b39641 Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4' ...

* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
  af_channelmap: properly set the supported output channel layouts

Conflicts:
	libavfilter/af_channelmap.c

See: 39867f3e098ab304cd3bef0ace19d73617cdb817
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

2015-07-23 11:57:45 +02:00

..

x86

x86/vf_ssim: add ff_ssim_4x4_line_xop

2015-07-20 13:18:05 -03:00

aeval.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_adelay.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_aecho.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_afade.c

avfilter/af_afade: add couple of more curves

2015-06-15 20:55:05 +00:00

af_aformat.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_amerge.c

avfilter/af_amerge: increase max number of channels from 32 to 64

2015-07-20 09:59:59 +00:00

af_amix.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_anull.c

…

af_apad.c

…

af_aphaser.c

avfilter/af_aphaser: reject too small delay

2015-05-12 12:04:09 +00:00

af_aresample.c

avfilter/af_aresample: Check ff_all_* for allocation failures

2015-07-17 21:13:56 +02:00

af_asetnsamples.c

…

af_asetrate.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_ashowinfo.c

Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

2015-05-20 19:14:11 +02:00

af_astats.c

avfilter/af_astats: use UINT64_C instead of the LLU suffix

2015-07-20 00:05:20 -03:00

af_astreamsync.c

…

af_asyncts.c

…

af_atempo.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_biquads.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_bs2b.c

avfilter: use AVFILTER_DEFINE_CLASS()

2015-07-02 15:36:00 +00:00

af_channelmap.c

Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'

2015-07-23 11:57:45 +02:00

af_channelsplit.c

…

af_chorus.c

avfilter: add chorus filter

2015-04-11 20:39:43 +00:00

af_compand.c

avfilter/af_compand: fix clipping with default options

2015-07-17 11:29:29 +00:00

af_dcshift.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_dynaudnorm.c

avfilter/af_dynaudnorm: Use av_frame_get_channels()

2015-07-18 10:45:29 +02:00

af_earwax.c

…

af_flanger.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_join.c

…

af_ladspa.c

…

af_pan.c

lavfi/af_pan: Support a maximum of 64 channels.

2015-07-17 00:18:29 +02:00

af_replaygain.c

…

af_resample.c

Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'

2015-07-19 16:05:33 +02:00

af_silencedetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_silenceremove.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_volume.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_volume.h

…

af_volumedetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

all_channel_layouts.inc

…

allfilters.c

avfilter: add deband filter

2015-07-22 15:52:02 +00:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_anullsrc.c

…

asrc_flite.c

…

asrc_sine.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

audio.c

…

audio.h

…

avcodec.c

…

avcodec.h

…

avf_avectorscope.c

…

avf_concat.c

…

avf_showcqt.c

avfilter/avf_showcqt: Fix gamma comparisons

2015-05-12 20:31:21 +02:00

avf_showspectrum.c

…

avf_showvolume.c

avfilter/avf_showvolume: make it possible to use current channel number in color expression

2015-07-03 18:43:21 +00:00

avf_showwaves.c

lavfi: add showwavespic filter

2015-03-18 12:19:08 +01:00

avfilter.c

Replace av_dlog with normal av_log at trace level

2015-04-19 12:41:59 +01:00

avfilter.h

lavfi: Move avcodec header to the only filter needing it

2015-05-19 18:56:40 +01:00

avfiltergraph.c

avfilter/avfiltergraph: Rename ff_avfilter_graph_config_pointers to graph_config_pointers.

2015-05-18 13:22:27 +02:00

avfiltergraph.h

…

avfilterres.rc

…

bbox.c

…

bbox.h

…

buffer.c

…

bufferqueue.h

…

buffersink.c

avfilter/buffersink: return EOF if closed link in av_buffersink_get_frame_flags()

2015-05-17 00:22:09 +02:00

buffersink.h

…

buffersrc.c

buffersrc: Use the correct deallocation function

2015-04-22 12:26:53 +02:00

buffersrc.h

…

deshake_opencl_kernel.h

…

deshake_opencl.c

…

deshake_opencl.h

…

deshake.h

…

drawutils.c

avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color()

2015-06-13 21:33:18 +02:00

drawutils.h

…

dualinput.c

…

dualinput.h

…

f_drawgraph.c

lavfi: add (a)drawgraph filter

2015-07-03 18:43:21 +00:00

f_ebur128.c

…

f_interleave.c

…

f_perms.c

…

f_select.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

f_sendcmd.c

…

f_zmq.c

…

fifo.c

…

filtfmts.c

filtfmts: Avoid null pointer dereference

2015-04-19 23:45:35 +01:00

formats.c

libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.

2015-06-20 19:51:14 +02:00

formats.h

avfilter/formats: proper error handling in ff_set_common_*() functions

2015-03-16 23:43:12 +01:00

framesync.c

…

framesync.h

…

generate_wave_table.c

…

generate_wave_table.h

…

gradfun.h

…

graphdump.c

…

graphparser.c

…

interlace.h

…

internal.h

avfilter/internal: add more words to sentance

2015-07-15 13:09:41 +02:00

lavfutils.c

avfilter/lavfutils: disable frame threads when decoding a single image

2015-04-30 03:48:33 +02:00

lavfutils.h

…

libavfilter.v

…

log2_tab.c

…

lswsutils.c

…

lswsutils.h

…

Makefile

avfilter: add deband filter

2015-07-22 15:52:02 +00:00

opencl_allkernels.c

…

opencl_allkernels.h

…

psnr.h

vf_psnr: sse2 optimizations for sum-squared-error.

2015-07-14 17:57:14 +02:00

pthread.c

…

removegrain.h

avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions

2015-07-14 23:50:50 +00:00

setpts.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

settb.c

…

split.c

…

src_movie.c

…

ssim.h

vf_ssim: x86 simd for ssim_4x4xN and ssim_endN.

2015-07-14 05:07:07 +02:00

thread.h

…

tinterlace.h

avfilter/tinterlace: Change enum to int, which is accessed via AVOption as int

2015-03-30 00:08:57 +02:00

transform.c

…

transform.h

…

trim.c

…

unsharp_opencl_kernel.h

…

unsharp_opencl.c

…

unsharp_opencl.h

…

unsharp.h

…

version.h

avfilter: add deband filter

2015-07-22 15:52:02 +00:00

vf_alphamerge.c

…

vf_aspect.c

…

vf_bbox.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_blackdetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_blackframe.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_blend.c

avfilter/vf_blend: unbreak tblend

2015-07-18 05:01:16 +00:00

vf_boxblur.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_codecview.c

avfilter: fix a few 5 spaces indent

2015-06-07 20:18:15 +02:00

vf_colorbalance.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_colorchannelmixer.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_colorkey.c

avfilter/vf_colorkey: Add colorkey video filter

2015-06-14 01:04:14 +02:00

vf_colorlevels.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_colormatrix.c

avfilter/vf_colormatrix: add yuv444p support

2015-07-08 05:40:03 +00:00

vf_copy.c

…

vf_cover_rect.c

avfilter: use AVFILTER_DEFINE_CLASS()

2015-07-02 15:36:00 +00:00

vf_crop.c

libavfilter/vf_crop: implement process_command

2015-07-21 19:19:36 +02:00

vf_cropdetect.c

lavfi/cropdetect: Fix cropdetect for > 8 bit input.

2015-05-04 17:50:16 +02:00

vf_curves.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_dctdnoiz.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_deband.c

avfilter: add deband filter

2015-07-22 15:52:02 +00:00

vf_decimate.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_dejudder.c

…

vf_delogo.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_deshake.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_detelecine.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_drawbox.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_drawtext.c

Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'

2015-04-21 20:20:58 +02:00

vf_edgedetect.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_elbg.c

Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats

2015-03-18 01:18:40 +01:00

vf_eq.c

avfilter/vf_eq: Support contrast from -1000 to 1000

2015-07-16 18:50:24 +02:00

vf_eq.h

lavfi/eq: rework expression evaluation

2015-03-20 09:41:32 +01:00

vf_extractplanes.c

avfilter/vf_extractplanes: use faster path for input formats with only one component

2015-07-01 17:19:52 +00:00

vf_fade.c

avfilter/vf_fade: Force alpha pixel format if alpha is set to 1

2015-05-31 04:31:28 +02:00

vf_fftfilt.c

avfilter/vf_fftfilt: Add MAX_PLANES and change it to 4

2015-05-12 20:08:18 +02:00

vf_field.c

avfilter/vf_field: Change enum to int, which is accessed via AVOption as int

2015-03-17 16:52:10 +01:00

vf_fieldmatch.c

avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int

2015-03-17 17:11:42 +01:00

vf_fieldorder.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

vf_find_rect.c

avfilter: use AVFILTER_DEFINE_CLASS()

2015-07-02 15:36:00 +00:00

vf_format.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fps.c

…

vf_framepack.c

avfilter: use AVFILTER_DEFINE_CLASS()

2015-07-02 15:36:00 +00:00

vf_framestep.c

…

vf_frei0r.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fspp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fspp.h

…

vf_geq.c

avfilter/geq: assert on pixel format descriptor

2015-06-13 20:51:43 +02:00

vf_gradfun.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_hflip.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_histeq.c

Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats

2015-03-18 01:18:40 +01:00

vf_histogram.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_hqdn3d.c

avfilter/vf_hqdn3d: Initialize the whole LUT

2015-05-27 05:18:55 +02:00

vf_hqdn3d.h

…

vf_hqx.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_hue.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_idet.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_idet.h

…

vf_il.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_interlace.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_kerndeint.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_lenscorrection.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_libopencv.c

avfilter/vf_libopencv: Make ocv_filter_entries const

2015-05-02 15:13:30 +02:00

vf_lut3d.c

avfilter/lut3d: assert on pixel format descriptor

2015-06-13 20:51:43 +02:00

vf_lut.c

avfilter/vf_lut: fix oversight

2015-07-03 16:58:56 +00:00

vf_mcdeint.c

avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int

2015-03-20 19:12:57 +01:00

vf_mergeplanes.c

…

vf_mpdecimate.c

avfilter/vf_mpdecimate: remove packed formats

2015-07-02 15:36:00 +00:00

vf_neighbor.c

avfilter: add erosion, dilation, deflate & inflate filter

2015-07-15 13:21:47 +00:00

vf_noise.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_noise.h

…

vf_null.c

…

vf_overlay.c

avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as int

2015-03-20 19:11:58 +01:00

vf_owdenoise.c

avfilter: fix a few 5 spaces indent

2015-06-07 20:18:15 +02:00

vf_pad.c

Revert "lavfi: always check av_expr_parse_and_eval() return value"

2015-05-05 16:27:24 +02:00

vf_palettegen.c

…

vf_paletteuse.c

…

vf_perspective.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_phase.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pixdesctest.c

…

vf_pp7.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pp7.h

…

vf_pp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_psnr.c

vf_psnr: sse2 optimizations for sum-squared-error.

2015-07-14 17:57:14 +02:00

vf_pullup.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pullup.h

…

vf_qp.c

avfilter/vf_qp: Fix use of uinitialized variable

2015-04-21 22:54:13 +02:00

vf_random.c

avfilter: add random video filter

2015-07-19 19:01:00 +00:00

vf_removegrain.c

avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions

2015-07-14 23:50:50 +00:00

vf_removelogo.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_repeatfields.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_reverse.c

avfilter: Add reverse filter

2015-07-19 14:13:51 +01:00

vf_rotate.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_sab.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_scale.c

libavfilter/vf_scale: implement process_command

2015-07-21 18:20:22 +02:00

vf_separatefields.c

…

vf_setfield.c

avfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int

2015-03-22 17:30:24 +01:00

vf_showinfo.c

…

vf_showpalette.c

…

vf_shuffleplanes.c

avfilter: use AVFILTER_DEFINE_CLASS()

2015-07-02 15:36:00 +00:00

vf_signalstats.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_smartblur.c

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

2015-07-15 13:34:56 +00:00

vf_spp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_spp.h

…

vf_ssim.c

avfilter/vf_ssim: Fix "incompatible pointer type" warnings

2015-07-14 13:29:55 +02:00

vf_stereo3d.c

avfilter/vf_stereo3d: implement slice threading for anaglyph output

2015-07-12 20:05:56 +00:00

vf_subtitles.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_super2xsai.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_swapuv.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_telecine.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_thumbnail.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_tile.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_tinterlace.c

lavfi/tinterlace: Double aspect ratio for modes merge and pad.

2015-06-04 17:03:29 +02:00

vf_transpose.c

avfilter/vf_transpose: Fix rounding error

2015-06-30 16:02:09 +02:00

vf_unsharp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_uspp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_vflip.c

…

vf_vidstabdetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_vidstabtransform.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_vignette.c

avfilter: fix a few 5 spaces indent

2015-06-07 20:18:15 +02:00

vf_w3fdif.c

avfilter/vf_w3fdif: implement slice threading

2015-07-12 20:06:03 +00:00

vf_xbr.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_yadif.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_zoompan.c

avfilter/vf_zoompan: support planar rgb pixel formats

2015-06-12 17:15:20 +00:00

video.c

…

video.h

…

vidstabutils.c

…

vidstabutils.h

…

vsink_nullsink.c

…

vsrc_cellauto.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vsrc_life.c

avfilter/vsrc_life: Fix mix of declarations and statements

2015-04-09 11:40:44 +02:00

vsrc_mandelbrot.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vsrc_mptestsrc.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vsrc_testsrc.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

yadif.h

avfilter/yadif: Change enums to int, which are accessed via AVOption as int

2015-04-05 15:46:11 +02:00