1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavfilter
Michael Niedermayer d0492578c8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  presets: rename presets directory
  lavc: make avcodec_get_context_defaults3 "officially" public
  lavf: replace av_new_stream->avformat_new_stream part II.
  lavf,lavd: replace av_new_stream->avformat_new_stream part I.
  lavf: add avformat_new_stream as a replacement for av_new_stream.
  Use correct scaling table for bwd-pred MVs in second B-field
  Ut Video decoder
  Makefile: change presets extension to .avpreset
  lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
  lavfi: add testsrc source
  AVOptions: add documentation.
  presets: update libx264 ffpresets

Conflicts:
	Changelog
	doc/APIchanges
	doc/ffmpeg.texi
	ffpresets/libx264-ipod320.ffpreset
	ffpresets/libx264-ipod640.ffpreset
	ffserver.c
	libavcodec/avcodec.h
	libavcodec/options.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavfilter/avfilter.h
	libavfilter/vsrc_testsrc.c
	libavformat/flvdec.c
	libavformat/riff.c
	libavformat/version.h
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20 02:34:51 +02:00
..
libmpcodecs libavfilter/libmpcodecs: add vf_stereo3d support 2011-09-20 05:49:42 +02:00
x86
af_aconvert_rematrix.c lavfi: add audio convert filter 2011-09-16 20:44:27 +02:00
af_aconvert.c lavu: add av_strtok() 2011-10-18 18:21:03 +02:00
af_aformat.c lavu: add av_strtok() 2011-10-18 18:21:03 +02:00
af_anull.c
af_aresample.c af_aresample: fix properties setting in the output buffer 2011-10-16 00:52:23 +02:00
af_ashowinfo.c af_ashowinfo: fix plane size computation for planar layout formats 2011-10-16 01:58:31 +02:00
all_channel_layouts.h lavfi: add avfilter_all_channel_layouts public symbol 2011-09-16 00:46:41 +02:00
allfilters.c lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs 2011-10-19 07:09:08 +02:00
asink_anullsink.c
asrc_abuffer.c lavu: add av_strtok() 2011-10-18 18:21:03 +02:00
asrc_abuffer.h lavfi: add asrc_abuffer - audio buffer source 2011-08-21 11:37:57 +02:00
asrc_aevalsrc.c asrc_aevalsrc: apply misc cleanup in the options array 2011-10-18 18:52:50 +02:00
asrc_anullsrc.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
avcodec.c
avcodec.h
avfilter.c lavfi: add debug trace when processing events 2011-09-25 22:47:51 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
avfiltergraph.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
avfiltergraph.h Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
buffersink.h lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
defaults.c lavfi: rename avfilter_all_* function names to avfilter_make_all_* 2011-09-16 00:42:47 +02:00
drawutils.c
drawutils.h
formats.c lavfi: add LUT (LookUp Table) generic filters 2011-10-17 18:05:38 +02:00
gradfun.h
graphparser.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
internal.h lavfi: add LUT (LookUp Table) generic filters 2011-10-17 18:05:38 +02:00
libavfilter.v
Makefile lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs 2011-10-19 07:09:08 +02:00
sink_buffer.c sink_buffer: fix typo 2011-09-28 22:28:47 +02:00
src_movie.c src_movie: Fix incompatible pointer type warning. 2011-10-19 00:03:56 +02:00
transform.c doxygen: remove a few @file parameters. 2011-10-04 08:04:17 +02:00
transform.h doxygen: remove a few @file parameters. 2011-10-04 08:04:17 +02:00
vf_aspect.c
vf_blackframe.c vf_blackframe: port missing features from libmpcodecs blackframe 2011-07-21 13:04:48 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
vf_copy.c
vf_crop.c vf_crop: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
vf_cropdetect.c
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
vf_deshake.c deshake: limit deshake to specific area to search for motion vectors. 2011-10-20 00:39:34 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
vf_drawtext.c vf_drawtext: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_fade.c
vf_fieldorder.c
vf_fifo.c
vf_format.c lavfi: add ff_parse_pixel_format() internal function, and use it 2011-08-23 15:45:44 +02:00
vf_frei0r.c lavu: add av_strtok() 2011-10-18 18:21:03 +02:00
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_libopencv.c vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 2011-07-18 12:33:13 +02:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
vf_mp.c vf_mp: Fix several incompatible pointer type warnings. 2011-10-19 00:05:30 +02:00
vf_null.c
vf_overlay.c vf_overlay: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_pad.c vf_pad: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_pixdesctest.c vf_pixdesctest: Fix incompatible pointer type warning. 2011-10-18 23:59:59 +02:00
vf_scale.c vf_scale: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_select.c vf_select: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_setpts.c vf_setpts: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_settb.c vf_settb: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2011-09-12 21:01:12 +02:00
vf_slicify.c
vf_split.c lavfi: add split filter from soc. 2011-09-12 08:48:16 +02:00
vf_transpose.c vf_transpose: avoid multiple calls to avfilter_draw_slice() 2011-07-29 20:24:44 +02:00
vf_unsharp.c vf_unsharp: Fix false ‘src2’ may be used uninitialized in this function warning. 2011-10-19 00:04:33 +02:00
vf_vflip.c
vf_yadif.c yadif: Fix assignment from incompatible pointer type warning 2011-10-18 23:59:20 +02:00
vsink_nullsink.c
vsrc_buffer.c vsrc_buffer: FIx incompatible pointer type warning 2011-10-18 23:58:41 +02:00
vsrc_buffer.h vsrc_buffer: remove duplicated file description 2011-09-19 12:43:10 +02:00
vsrc_color.c vsrc_color: use internal timebase 2011-09-28 08:03:11 +02:00
vsrc_mptestsrc.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
vsrc_nullsrc.c vsrc_nullsrc: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
vsrc_testsrc.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
yadif.h