ffmpeg/libavfilter
Michael Niedermayer ab2989378f Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
	libavformat/utils.c

See: 44a7a6300d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:24:33 +02:00
..
libmpcodecs lavfi: remove harddup libmpcodecs wrapper 2013-03-19 17:15:53 +00:00
x86 lavfi/gradfun: remove rounding to match C and SSE code. 2013-03-28 07:59:29 +01:00
af_aconvert.c avfilter: avoid direct access to AVFrame.channels 2013-03-15 16:13:53 +01:00
af_afade.c lavfi/afade * biquads: call av_frame_copy_props() 2013-04-03 11:10:00 +00:00
af_aformat.c lavfi/af_aformat: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_amerge.c lavfi/af_amerge: return EAGAIN if the input layouts are not known. 2013-03-24 23:17:47 +01:00
af_amix.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_anull.c lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_apad.c lavfi/apad: use standard options parsing. 2013-03-24 12:26:24 +01:00
af_aphaser.c aphaser filter 2013-04-03 08:33:59 +00:00
af_aresample.c avfilter: avoid direct access to AVFrame.channels 2013-03-15 16:13:53 +01:00
af_asetnsamples.c lavfi/af_asetnsamples: simplify request_frame loop. 2013-04-03 17:44:10 +02: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 '20a8ee3061e6d777600c13db731bee3c25878991' 2013-03-23 12:16:32 +01:00
af_atempo.c lavfi/af_atempo: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
af_biquads.c lavfi/afade * biquads: call av_frame_copy_props() 2013-04-03 11:10:00 +00:00
af_channelmap.c lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
af_channelsplit.c af_channelsplit: set output channels, fix assertion failure 2013-03-28 14:29:11 +01: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 avfilter: avoid direct access to AVFrame.channels 2013-03-15 16:13:53 +01:00
af_resample.c lavfi: switch to AVFrame. 2013-03-08 07:37:18 +01:00
af_silencedetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01: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 aphaser filter 2013-04-03 08:33:59 +00:00
asink_anullsink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_abuffer.h
asrc_aevalsrc.c lavfi/aevalsrc: raise filter_frame() error. 2013-03-13 19:00:09 +01: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: raise filter_frame() error. 2013-03-13 19:00:09 +01:00
avf_showwaves.c lavfi/showwaves: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-20 12:29:54 +00:00
avfilter.c lavfi: reindent after last commit. 2013-04-03 17:44:10 +02:00
avfilter.h lavfi: loop on request_frame if necessary. 2013-04-03 17:33:27 +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 Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804' 2013-03-20 11:30:56 +01: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/f_ebur128: remove request_frame hack. 2013-04-03 17:44:10 +02:00
f_perms.c lavfi/perms: add myself to the copyright header. 2013-03-26 02:41:05 +01:00
f_select.c lavfi/select: use standard options parsing. 2013-03-24 12:26:24 +01:00
f_sendcmd.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_setpts.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_settb.c lavfi/settb: use standard options parsing. 2013-03-24 12:26:24 +01: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 lavfi/gradfun: support named options. 2012-12-19 03:13:26 +01: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 Fix make checkheaders without opencl headers. 2013-04-03 15:28:29 +02: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 aphaser filter 2013-04-03 08:33:59 +00: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 '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01: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 lavfi/blackframe: use standard options parsing. 2013-03-24 12:26:24 +01:00
vf_blend.c blend: Adding yuvj pixelformats to the blend effect 2013-03-25 13:14:38 +01:00
vf_boxblur.c lavfi/boxblur: use standard options parsing. 2013-03-24 12:26:24 +01:00
vf_colormatrix.c lavfi/colormatrix: reword error message in init 2013-03-24 20:21:35 +01:00
vf_copy.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_crop.c lavfi/vf_crop: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_cropdetect.c lavfi/cropdetect: use standard options parsing. 2013-03-24 12:26:24 +01:00
vf_curves.c lavfi/curves: make use of options to store the preset names. 2013-04-01 20:37:45 +02:00
vf_decimate.c decimate: check for avctx ptr before closing. 2013-03-31 10:00:32 +02:00
vf_delogo.c lavfi/vf_delogo: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_deshake.c vf_deshake: Reorder constant arguments in an if() statement. 2013-04-03 12:52:38 +02:00
vf_drawbox.c lavi/vf_drawbox: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_drawtext.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_edgedetect.c lavfi/edgedetect: reindent after previous commit. 2013-04-03 00:31:19 +02:00
vf_fade.c lavfi/vf_fade: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_field.c lavfi/field: use standard options parsing. 2013-03-24 12:26:24 +01:00
vf_fieldorder.c lavfi/fieldorder: use standard options parsing. 2013-03-24 12:26:24 +01:00
vf_format.c
vf_fps.c lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-26 13:23:41 +00:00
vf_framestep.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_frei0r.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_geq.c lavfi/geq: use standard options parsing. 2013-03-24 12:26:24 +01:00
vf_gradfun.c lavfi/gradfun: fix rounding in MMX code. 2013-03-28 07:59:04 +01:00
vf_hflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_histeq.c lavfi/histeq: use standard options parsing. 2013-03-24 12:26:25 +01:00
vf_histogram.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2013-03-13 14:49:00 +01:00
vf_hqdn3d.h avfilter/vf_hqdn3d.h: restore author attribution, history and project name 2013-02-02 13:18:10 +01:00
vf_hue.c lavfi/hue: reindent. 2013-03-10 02:13:02 +01:00
vf_idet.c lavfi/idet: use standard options parsing. 2013-03-24 12:26:25 +01:00
vf_il.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_kerndeint.c lavfi/kerndeint: use standard options parsing. 2013-03-24 12:26:25 +01:00
vf_libopencv.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_lut.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_mp.c lavfi: remove harddup libmpcodecs wrapper 2013-03-19 17:15:53 +00:00
vf_noise.c lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
vf_null.c
vf_overlay.c lavfi/overlay: fix debug PTS output in try_filter_frame() 2013-03-31 18:00:44 +02:00
vf_pad.c lavfi/vf_pad: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_pixdesctest.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_pp.c vf_pp: use new API to access qp table 2013-03-15 03:02:27 +01:00
vf_removelogo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_scale.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01: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/smartblur: use standard options parsing. 2013-03-24 12:26:25 +01:00
vf_stereo3d.c lavfi/vf_stereo3d: use standard options parsing 2013-03-21 09:17:32 +00:00
vf_subtitles.c lavfi/subtitles: use standard options parsing. 2013-03-24 12:26:25 +01: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: add support for named options. 2013-03-24 20:38:12 +01:00
vf_tile.c lavfi/vf_tile: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
vf_tinterlace.c lavfi/tinterlace: use standard options parsing. 2013-03-24 12:26:25 +01:00
vf_transpose.c lavfi/vf_transpose: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_unsharp.c lavfi/vf_unsharp: use standard options parsing. 2013-03-20 21:13:56 +01:00
vf_vflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_yadif.c lavfi/vf_yadif: use standard options parsing. 2013-03-20 21:13:56 +01: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: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-26 13:23:42 +00:00
vsrc_life.c lavfi/life: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-26 13:23:42 +00:00
vsrc_mandelbrot.c vsrc_mandelbrot: Mandel morphing support 2013-03-27 19:27:37 +01:00
vsrc_mptestsrc.c lavfi/mptestsrc: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-26 13:23:42 +00:00
vsrc_testsrc.c lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE 2013-03-26 13:23:41 +00:00
yadif.h yadif: restore speed of the C filtering code 2013-03-13 22:07:25 +01:00