RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavfilter
History
Michael Niedermayer 54a71f2e6c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
  pixdesc: fix yuva 10bit bit depth
  avconv: deprecate the -vol option
  x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
  x86: af_volume: add SSE2-optimized s16 volume scaling

Conflicts:
	ffmpeg.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-12-06 15:55:47 +01:00
..
libmpcodecs lavfi/mp: add ff_ prefix to exported symbols 2012-12-06 12:38:37 +01:00
x86 Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
Makefile lavfi: rename af_volume to af_volume_stefano 2012-12-06 15:29:23 +01:00
af_aconvert.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_aformat.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_amerge.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_amix.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
af_anull.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_aresample.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_asetnsamples.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_ashowinfo.c Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666' 2012-11-29 02:51:22 +01:00
af_astreamsync.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_asyncts.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
af_atempo.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_channelmap.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
af_channelsplit.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
af_earwax.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_join.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
af_pan.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
af_resample.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
af_silencedetect.c lavfi/silencedetect: use eval builtin to parse dB. 2012-12-06 15:08:38 +01:00
af_volume.h Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
af_volume_justin.c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
af_volume_stefano.c lavfi: rename af_volume to af_volume_stefano 2012-12-06 15:29:23 +01:00
af_volumedetect.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
all_channel_layouts.inc
…
allfilters.c Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c' 2012-12-06 15:18:59 +01:00
asink_anullsink.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
asrc_abuffer.h
…
asrc_aevalsrc.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
asrc_anullsrc.c lavfi: replace filter_samples by filter_frame 2012-11-28 16:43:34 +01:00
asrc_flite.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
audio.c libavfilter: Support using filter_frame for video 2012-11-28 16:43:34 +01:00
audio.h libavfilter: Support using filter_frame for video 2012-11-28 16:43:34 +01:00
avcodec.c replace av_log(0, by av_log(NULL, 2012-11-23 18:10:02 +01:00
avcodec.h
…
avf_concat.c lavfi/concat: prefer av_asprintf() over stack allocated buffer. 2012-11-29 12:55:56 +01:00
avf_showspectrum.c lavfi/show{spectrum,waves}: use ff_filter_frame(). 2012-11-29 11:44:20 +01:00
avf_showwaves.c lavfi/show{spectrum,waves}: use ff_filter_frame(). 2012-11-29 11:44:20 +01:00
avfilter.c Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666' 2012-11-29 02:51:22 +01:00
avfilter.h avfilter: mark start_frame/end_frame/draw_slice as deprecated 2012-11-29 02:30:11 +01:00
avfiltergraph.c avfiltergraph: add aresample_swr_opts 2012-11-26 03:51:08 +01:00
avfiltergraph.h avfiltergraph: add aresample_swr_opts 2012-11-26 03:51:08 +01:00
bbox.c
…
bbox.h
…
buffer.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
bufferqueue.h
…
buffersink.c buffersink: switch to filter_frame 2012-11-29 01:55:26 +01:00
buffersink.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
buffersrc.c buffersrc: switch to filter_frame 2012-11-29 01:55:26 +01:00
buffersrc.h Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
drawutils.c Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480' 2012-11-21 15:37:01 +01:00
drawutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
f_ebur128.c lavfi/ebur128: use ff_filter_frame() everywhere. 2012-11-29 03:48:14 +01:00
f_sendcmd.c lavfi/sendcmd: expose the options for both filters. 2012-11-29 00:52:00 +01:00
f_setpts.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
f_settb.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
fifo.c libavfilter/fifo: fix indent 2012-11-28 19:18:24 +01:00
filtfmts.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
formats.c replace av_log(0, by av_log(NULL, 2012-11-23 18:10:02 +01:00
formats.h
…
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
graphdump.c Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
graphparser.c Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +02:00
internal.h libavfilter: update doxy for filter_frame 2012-11-28 16:43:34 +01:00
lavfutils.c libavfilter/lavfutils: remove useless NULL check on format context 2012-10-17 20:00:31 +02:00
lavfutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter.v
…
lswsutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lswsutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
sink_buffer.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
split.c libavfilter/split: switch to filter_frame 2012-11-29 01:20:53 +01:00
src_buffer.c Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
src_movie.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
transform.c transform: give avfilter_transform() a return value for returning an error 2012-11-04 01:30:16 +01:00
transform.h transform: give avfilter_transform() a return value for returning an error 2012-11-04 01:30:16 +01:00
version.h Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c' 2012-12-06 15:18:59 +01:00
vf_alphaextract.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
vf_alphamerge.c lavfi/alphamerge: fix leak introduced in 217163eb 2012-12-02 18:04:57 +01:00
vf_aspect.c vf_aspect: switch to filter_frame 2012-11-29 00:31:50 +01:00
vf_ass.c lavfi/subtitles: 10l close codec before format. 2012-12-04 23:56:02 +01:00
vf_bbox.c lavfi/bbox: switch to ff_filter_frame() API 2012-12-02 18:13:49 +01:00
vf_blackdetect.c lavfi/blackdetect: switch to new ff_filter_frame() API 2012-12-02 12:42:29 +01:00
vf_blackframe.c vf_blackframe: switch to filter_frame 2012-11-29 00:32:08 +01:00
vf_boxblur.c vf_boxblur: cosmetics to reduce diff to qatar 2012-11-28 19:18:24 +01:00
vf_colormatrix.c lavfi/colormatrix: 10l fix forgotten buffer unref. 2012-11-29 02:21:16 +01:00
vf_copy.c vf_copy: switch to filter_frame 2012-11-29 02:09:22 +01:00
vf_crop.c vf_crop: switch to filter_frame 2012-11-29 00:15:40 +01:00
vf_cropdetect.c vf_cropdetect: switch to filter_frame 2012-11-29 00:15:56 +01:00
vf_decimate.c lavfi/decimate: switch to ff_filter_frame() API 2012-12-02 12:42:29 +01:00
vf_delogo.c lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props. 2012-12-03 21:47:03 +01:00
vf_deshake.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
vf_drawbox.c vf_drawbox: switch to filter frame 2012-11-29 00:09:53 +01:00
vf_drawtext.c lavfi/drawtext: make use of outlink variable in filter_frame() 2012-12-06 13:51:27 +01:00
vf_edgedetect.c lavfi: add priv_class for some forgotten filters. 2012-11-29 00:50:37 +01:00
vf_fade.c vf_fade: switch to filter_frame 2012-11-28 23:47:01 +01:00
vf_field.c lavfi/field: switch to filter_frame API 2012-12-06 13:51:34 +01:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-11-29 02:54:50 +01:00
vf_format.c vf_format: switch to filter_frame 2012-11-29 02:09:40 +01:00
vf_fps.c vf_fps: switch to filter_frame 2012-11-28 19:28:41 +01:00
vf_framestep.c lavfi/framestep: switch to ff_filter_frame API 2012-12-02 15:02:05 +01:00
vf_frei0r.c vf_frei0r: switch to filter_frame, the filter did not support slices 2012-11-28 20:06:06 +01:00
vf_geq.c lavfi/geq: add T variable and example 2012-12-01 16:05:15 +01:00
vf_gradfun.c lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props. 2012-12-03 21:47:03 +01:00
vf_hflip.c vf_hflip: switch to filter_frame 2012-11-28 22:39:16 +01:00
vf_hqdn3d.c lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props. 2012-12-03 21:47:03 +01:00
vf_hue.c lavfi/hue: move to ff_filter_frame. 2012-12-02 14:44:31 +01:00
vf_idet.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
vf_libopencv.c vf_libopencv: switch to filter_frame, this filter did not support slices 2012-11-28 20:25:55 +01:00
vf_lut.c vf_lut: switch to filter_frame 2012-11-28 22:39:35 +01:00
vf_mp.c lavfi/mp: remove dead extern vf_info_t declarations. 2012-12-06 12:52:58 +01:00
vf_null.c vf_null: switch to filter_frame 2012-11-29 02:09:01 +01:00
vf_overlay.c lavfi: merge start_frame/draw_slice/end_frame 2012-11-28 08:50:19 +01:00
vf_pad.c vf_pad: switch to filter_frame 2012-11-28 21:28:02 +01:00
vf_pixdesctest.c vf_pixdesctest: switch to filter_frame 2012-11-28 20:25:55 +01:00
vf_removelogo.c lavfi/removelogo: switch to ff_filter_frame. 2012-12-04 02:31:40 +01:00
vf_scale.c vf_scale: switch to filter_frame 2012-11-29 01:20:53 +01:00
vf_select.c vf_select: switch to filter_frame 2012-11-28 21:28:02 +01:00
vf_setfield.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
vf_showinfo.c vf_showinfo: switch to filter_frame 2012-11-28 21:28:02 +01:00
vf_smartblur.c lavfi/smartblur: switch to filter_frame. 2012-11-29 12:49:03 +01:00
vf_super2xsai.c lavfi/vf_super2xsai: fix output ref size. 2012-12-02 17:08:17 +01:00
vf_swapuv.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
vf_thumbnail.c lavfi/thumbnail: re-use ctx instead of inlink->dst. 2012-11-29 01:43:28 +01:00
vf_tile.c lavfi/vf_tile: forward errors. 2012-12-02 13:53:41 +01:00
vf_tinterlace.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
vf_transpose.c vf_transpose: switch to filter_frame 2012-11-28 21:46:23 +01:00
vf_unsharp.c vf_unsharp: switch to filter_frame, this filter did not support slices 2012-11-28 21:47:39 +01:00
vf_vflip.c vflip: switch to filter_frame 2012-11-29 00:09:31 +01:00
vf_yadif.c vf_yadif: switch to filter_frame, this filter did not support slices 2012-11-28 23:47:01 +01:00
video.c libavfilter: default to filter_frame when neither it nor start/slice/end is set. 2012-11-29 02:08:49 +01:00
video.h lavfi: merge start_frame/draw_slice/end_frame 2012-11-28 08:50:19 +01:00
vsink_nullsink.c vsink_nullsink: switch to filter_frame 2012-11-28 21:49:04 +01:00
vsrc_cellauto.c lavfi/vsrc: switch to ff_filter_frame. 2012-12-02 00:23:45 +01:00
vsrc_life.c lavfi/vsrc: switch to ff_filter_frame. 2012-12-02 00:23:45 +01:00
vsrc_mandelbrot.c vsrc_mandelbrot: switch to filter_frame 2012-11-29 05:52:31 +01:00
vsrc_mptestsrc.c lavfi/vsrc: switch to ff_filter_frame. 2012-12-02 00:23:45 +01:00
vsrc_testsrc.c lavfi: convert remaining input/output list compound literals to named objects. 2012-11-28 23:19:20 +01:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00