1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavfilter
Michael Niedermayer f17651bd16 Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
* commit '3f14febbdf7c93bbd186399da27991180e5916b6':
  af_channelsplit: switch to an AVOptions-based system.

Conflicts:
	libavfilter/af_channelsplit.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:17:28 +02:00
..
libmpcodecs lavfi: remove noise libmpcodecs wrapper 2013-04-08 20:57:59 +00:00
x86 lavfi/gradfun: remove rounding to match C and SSE code. 2013-03-28 07:59:29 +01:00
af_aconvert.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
af_afade.c lavfi/afade: switch to AVOption-base system 2013-04-11 01:25:02 +02:00
af_aformat.c Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af' 2013-04-10 13:59:45 +02:00
af_amerge.c lavfi/amerge: drop duplicated "Buffer queue overflow" message 2013-04-10 18:02:00 +02:00
af_amix.c Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066' 2013-04-11 01:32:08 +02:00
af_anull.c lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_apad.c lavfi/apad: switch to AVOption-based system 2013-04-11 01:31:08 +02:00
af_aphaser.c lavfi/aphaser: switch to AVOption-based system 2013-04-11 01:37:57 +02:00
af_aresample.c avfilter: avoid direct access to AVFrame.channels 2013-03-15 16:13:53 +01:00
af_asetnsamples.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
af_ashowinfo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_astreamsync.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_asyncts.c Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30' 2013-04-11 01:42:28 +02:00
af_atempo.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
af_biquads.c lavfi/afade * biquads: call av_frame_copy_props() 2013-04-03 11:10:00 +00:00
af_channelmap.c Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a' 2013-04-11 02:10:12 +02:00
af_channelsplit.c Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6' 2013-04-11 02:17:28 +02:00
af_earwax.c lavfi/earwax: clip sample, this is what sox does 2013-04-03 10:55:13 +00:00
af_join.c af_join: fix channel count and format 2013-03-28 15:29:14 +01:00
af_pan.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
af_resample.c af_resample: switch to an AVOptions-based system. 2013-04-09 18:45:50 +02:00
af_silencedetect.c lavfi/silencedetect: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
af_volume.c lavfi/volume: use designated initializers for the sample_fmts declaration. 2013-03-31 11:58:20 +02:00
af_volume.h
af_volumedetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
all_channel_layouts.inc
allfilters.c separatefields filter 2013-04-10 00:08:57 +00:00
asink_anullsink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_abuffer.h
asrc_aevalsrc.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
asrc_anullsrc.c lavfi/anullsrc: add missing checks 2013-03-23 16:53:25 +01:00
asrc_flite.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_sine.c lavfi/sine: use standard options parsing. 2013-03-24 12:26:24 +01:00
audio.c avfilter: avoid direct access to "frame"->channels 2013-03-10 11:25:54 +01: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 lavfi/avcodec: deprecate remainders of the avcodec glue code 2013-03-16 17:04:36 +01:00
avf_concat.c lavfi/avf_concat: use standard options parsing. 2013-03-20 21:13:56 +01:00
avf_showspectrum.c lavfi/showspectrum: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
avf_showwaves.c lavfi/showwaves: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-20 12:29:54 +00:00
avfilter.c Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6' 2013-04-11 02:17:28 +02:00
avfilter.h Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff' 2013-04-10 13:30:17 +02:00
avfiltergraph.c Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756' 2013-04-04 13:24:33 +02:00
avfiltergraph.h Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf' 2013-03-16 16:09:37 +01:00
bbox.c
bbox.h
buffer.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
bufferqueue.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
buffersink.c buffersink/uninit: use av_frame_free() not unref 2013-03-23 23:49:33 +01:00
buffersink.h lavfi/buffersink: fix header. 2013-03-17 12:31:25 +01:00
buffersrc.c buffersrc: switch to an AVOptions-based system. 2013-04-09 18:48:16 +02:00
buffersrc.h lavfi/buffersrc: implement flags. 2013-03-10 13:56:17 +01:00
deshake_kernel.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
deshake_opencl.c deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +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: fix blending computation in blend_line function 2013-01-05 13:08:02 +01:00
drawutils.h lavfi/drawutils: fix typo 2013-01-05 05:21:44 +01:00
f_ebur128.c lavfi/ebur128: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
f_perms.c lavfi/perms: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
f_select.c Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e' 2013-04-10 23:24:48 +02:00
f_sendcmd.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_setpts.c Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff' 2013-04-10 23:49:58 +02:00
f_settb.c Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd' 2013-04-11 00:10:59 +02:00
fifo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
filtfmts.c
formats.c lavfi: detect merge failure for unknown layouts. 2013-04-01 10:37:48 +02:00
formats.h lavfi: fix merging of formats and clarify exception. 2013-02-24 11:58:52 +01:00
gradfun.h Merge commit '7ed833d78ea661d619124fd898547a900f6480bc' 2013-04-10 21:09:06 +02:00
graphdump.c Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf' 2013-03-16 16:09:37 +01:00
graphparser.c Merge remote-tracking branch 'qatar/master' 2013-04-03 15:20:05 +02:00
internal.h lavfi: loop on request_frame if necessary. 2013-04-03 17:33:27 +02:00
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile separatefields filter 2013-04-10 00:08:57 +00:00
opencl_allkernels.c deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
opencl_allkernels.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
split.c lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
src_movie.c lavfi/movie: raise filter_frame() error. 2013-03-13 19:00:09 +01:00
transform.c
transform.h
version.h lavfi/overlay: add process_command callback 2013-04-10 13:11:27 +02:00
vf_alphaextract.c lavfi/alphaextract: fix frame memleak. 2013-03-17 03:12:44 +01:00
vf_alphamerge.c lavfi/alphamerge: raise filter_frame() error. 2013-03-13 19:00:09 +01:00
vf_aspect.c Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a' 2013-04-10 15:37:21 +02:00
vf_bbox.c lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
vf_blackdetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_blackframe.c avfilter/blackframe: add "thres" back as alternative 2013-04-10 15:48:41 +02:00
vf_blend.c lavfi/blend: switch to AVOption-based system 2013-04-11 01:25:02 +02:00
vf_boxblur.c Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5' 2013-04-10 16:34:44 +02:00
vf_colormatrix.c lavfi/colormatrix: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
vf_copy.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_crop.c Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891' 2013-04-10 16:56:33 +02:00
vf_cropdetect.c Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd' 2013-04-10 17:36:29 +02:00
vf_curves.c lavfi/curves: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_decimate.c lavfi/decimate: switch to an AVOption-based system 2013-04-11 00:20:01 +02:00
vf_delogo.c Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e' 2013-04-10 17:54:20 +02:00
vf_deshake.c vf_deshake: Reorder constant arguments in an if() statement. 2013-04-03 12:52:38 +02:00
vf_drawbox.c Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735' 2013-04-10 18:11:15 +02:00
vf_drawtext.c Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a' 2013-04-10 18:31:14 +02:00
vf_edgedetect.c lavfi/edgedetect: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_fade.c Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd' 2013-04-10 18:48:07 +02:00
vf_field.c lavfi/field: switch to AVOption-based system 2013-04-11 00:16:25 +02:00
vf_fieldorder.c Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec' 2013-04-10 19:03:30 +02:00
vf_format.c Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af' 2013-04-10 13:59:45 +02:00
vf_fps.c Merge commit 'f13ab29925883b4245da4129694af3af378d67be' 2013-04-10 19:21:59 +02:00
vf_framestep.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_frei0r.c Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a' 2013-04-10 19:51:02 +02:00
vf_geq.c lavfi/geq: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_gradfun.c Merge commit '7ed833d78ea661d619124fd898547a900f6480bc' 2013-04-10 21:09:06 +02:00
vf_hflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_histeq.c lavfi/histeq: switch to an AVOptions-based system. 2013-04-11 01:04:44 +02:00
vf_histogram.c lavfi/histogram: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_hqdn3d.c Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a' 2013-04-10 21:14:30 +02:00
vf_hqdn3d.h Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a' 2013-04-10 21:14:30 +02:00
vf_hue.c lavfi/hue: reindent. 2013-03-10 02:13:02 +01:00
vf_idet.c lavfi/idet: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_il.c lavfi/il: switch to AVOption-based system 2013-04-11 00:31:25 +02:00
vf_kerndeint.c lavfi/kerndeint: switch to AVOption-based system 2013-04-11 00:55:45 +02:00
vf_libopencv.c Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319' 2013-04-10 21:25:01 +02:00
vf_lut.c Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6' 2013-04-10 22:13:34 +02:00
vf_mp.c lavfi: remove noise libmpcodecs wrapper 2013-04-08 20:57:59 +00:00
vf_noise.c lavfi/noise: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_null.c
vf_overlay.c lavfi/overlay: remove dupe initializer 2013-04-10 20:44:11 +00:00
vf_pad.c Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55' 2013-04-10 22:50:32 +02:00
vf_pixdesctest.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_pp.c lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_removelogo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_scale.c Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401' 2013-04-10 20:40:37 +02:00
vf_separatefields.c lavfi/separatefields: adjust tb to avoid rounding errors. 2013-04-10 02:38:54 +02:00
vf_setfield.c lavfi/setfield: use standard options parsing. 2013-03-24 12:26:25 +01:00
vf_showinfo.c Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b' 2013-03-16 16:38:11 +01:00
vf_smartblur.c lavfi/smarblur: add missing newline at end of verbose message 2013-04-11 00:04:27 +02:00
vf_stereo3d.c lavfi/stereo3d: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_subtitles.c lavfi/subtitles: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_super2xsai.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_swapuv.c lavfi/swapuv: remove deprecated base field use 2013-03-17 13:06:01 +01:00
vf_thumbnail.c lavfi/thumbnail: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
vf_tile.c lavfi/vf_tile: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
vf_tinterlace.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
vf_transpose.c Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa' 2013-04-11 00:33:31 +02:00
vf_unsharp.c Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280' 2013-04-11 01:02:07 +02:00
vf_vflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_yadif.c Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775' 2013-04-11 01:18:18 +02:00
video.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
video.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsink_nullsink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsrc_cellauto.c lavfi/cellauto: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_life.c lavfi/life: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_mandelbrot.c lavfi/mandelbrot: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_mptestsrc.c lavfi/mptestsrc: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_testsrc.c lavfi/smptebars: fix invalid writes 2013-04-04 22:10:42 +00:00
yadif.h vf_yadif: switch to an AVOptions-based system. 2013-04-09 19:09:03 +02:00