ffmpeg/libavfilter
Michael Niedermayer f9a2d0c3fe Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  avconv: Reformat s16 volume adjustment.
  ARM: NEON optimised vector_fmac_scalar()
  dca: use vector_fmac_scalar from dsputil
  dsputil: add vector_fmac_scalar()
  latmenc: Fix private options
  vf_unsharp: store hsub/vsub in the filter context
  vf_unsharp: adopt a more natural order of params in apply_unsharp()
  vf_unsharp: rename method "unsharpen" to "apply_unsharp"
  vf_scale: apply the same transform to the aspect during init that is applied per frame
  vf_pad: fix "vsub" variable value computation
  vf_scale: add a "sar" variable
  lavfi: fix realloc size computation in avfilter_add_format()
  vsrc_color: use internal timebase
  lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
  graphparser: prefer void * over AVClass * for log contexts
  avfiltergraph: use meaningful error codes
  avconv: Initialize return value for codec copy path.
  fate: use 'run' helper for seek-test
  fate: remove seek-mpeg2reuse test
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  ...

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/graphparser.c
	libavfilter/vf_scale.c
	libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 01:11:01 +02:00
..
libmpcodecs libavfilter/libmpcodecs: add vf_stereo3d support 2011-09-20 05:49:42 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
af_aconvert_rematrix.c lavfi: add audio convert filter 2011-09-16 20:44:27 +02:00
af_aconvert.c lavfi: add audio convert filter 2011-09-16 20:44:27 +02:00
af_aformat.c lavfi: rename avfilter_all_* function names to avfilter_make_all_* 2011-09-16 00:42:47 +02:00
af_anull.c
af_aresample.c af_aresample: do not request a buffer with AV_PERM_REUSE2 permissions in filter_samples() 2011-09-17 01:36:00 +02:00
af_ashowinfo.c lavfi: add ashowinfo filter 2011-08-20 15:00:23 +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 select filter 2011-09-17 19:08:30 +02:00
asink_anullsink.c
asrc_abuffer.c lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps 2011-09-12 18:51:46 +02:00
asrc_abuffer.h lavfi: add asrc_abuffer - audio buffer source 2011-08-21 11:37:57 +02:00
asrc_anullsrc.c asrc_anullsrc: amend description to reflect the recent changes 2011-09-18 14:26:37 +02:00
avcodec.c libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
avcodec.h libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
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-09-29 01:11:01 +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: fix realloc size computation in avfilter_add_format() 2011-09-28 08:03:18 +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: document AVFilterCommand fields 2011-09-25 22:47:51 +02:00
libavfilter.v
Makefile libavfilter/libmpcodecs: add vf_stereo3d support 2011-09-20 05:49:42 +02:00
sink_buffer.c sink_buffer: fix typo 2011-09-28 22:28:47 +02:00
src_movie.c lavfi: simplify signature for avfilter_get_audio_buffer() and friends 2011-09-12 18:51:18 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_blackframe.c vf_blackframe: port missing features from libmpcodecs blackframe 2011-07-21 13:04:48 +02:00
vf_boxblur.c vf_boxblur: remove useless code. 2011-09-28 16:11:01 +02:00
vf_copy.c
vf_crop.c vf_crop: add support for a, dar, sar, hsub, and vsub variables 2011-07-30 18:30:07 +02:00
vf_cropdetect.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_delogo.c lavfi: port libmpcodecs delogo filter 2011-08-14 12:17:10 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
vf_drawtext.c vf_drawtext: apply misc style fixes 2011-09-25 22:47:51 +02:00
vf_fade.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_fieldorder.c Remove unused variables 2011-06-02 20:06:00 +01:00
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 Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
vf_gradfun.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_hflip.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_hqdn3d.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
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 libavfilter: fix --enable-small 2011-07-21 11:00:47 +02:00
vf_mp.c libavfilter/libmpcodecs: add vf_stereo3d support 2011-09-20 05:49:42 +02:00
vf_null.c
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_pad.c vf_pad: fix "vsub" variable value computation 2011-09-28 08:03:30 +02:00
vf_pixdesctest.c
vf_scale.c vf_scale: apply the same transform to the aspect during init that is applied per frame 2011-09-28 08:08:30 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +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: store hsub/vsub in the filter context 2011-09-28 08:09:18 +02:00
vf_vflip.c
vf_yadif.c vf_yadif: add support to yuva420p 2011-09-21 09:00:24 +02:00
vsink_nullsink.c
vsrc_buffer.c lavfi: add ff_parse_pixel_format() internal function, and use it 2011-08-23 15:45:44 +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 lavfi: port mp test source 2011-08-11 16:19:48 +02:00
vsrc_nullsrc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vsrc_testsrc.c vsrc_testsrc: set more properties in the output frames 2011-08-30 10:03:19 +02:00
yadif.h