Michael Niedermayer 6d6b0c96fd Merge remote branch 'qatar/master' ...

* qatar/master:
  drawtext: add documentation for the shadow parameters
  drawtext: add shadow support.
  drawtext: factor draw_glyphs.
  drawtext: fix and optimize yuv blend.
  drawtext: get rid of divisions in the inner loop.
  drawtext: simplify chroma blend and fix chroma alpha.
  lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

Conflicts:
	configure
	libavfilter/avfilter.h
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-05-08 03:29:51 +02:00

..

libmpcodecs

mp: remove use of deprecated old eval API

2011-04-21 18:45:56 +02:00

x86

Align stack variables manually in yadif x86 code, should fix ticket25

2011-04-07 01:49:06 +02:00

af_anull.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

allfilters.c

lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

2011-05-07 10:17:40 +02:00

asink_anullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

asrc_anullsrc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avcodec.c

lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()

2011-05-07 12:03:49 +02:00

avcodec.h

lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()

2011-05-07 12:03:49 +02:00

avfilter.c

avfilter: dont use AVFilterLink as priv for pictures as its freed too early.

2011-05-07 01:02:38 +02:00

avfilter.h

lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()

2011-05-07 12:03:49 +02:00

avfiltergraph.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avfiltergraph.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

defaults.c

avfilter: dont use AVFilterLink as priv for pictures as its freed too early.

2011-05-07 01:02:38 +02:00

drawutils.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

drawutils.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

formats.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

gradfun.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

graphparser.c

graphparser: add a NULL check on the argument passed to strstr

2011-04-25 22:45:44 +02:00

internal.h

AVFilter: use picture pool to avoid malloc().

2011-05-06 23:53:06 +02:00

libavfilter.v

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

Makefile

lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()

2011-05-07 12:03:49 +02:00

vf_aspect.c

lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

2011-05-01 13:10:18 +02:00

vf_blackframe.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_copy.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_crop.c

crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

2011-04-28 07:25:27 +02:00

vf_cropdetect.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_drawbox.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_drawtext.c

drawtext: add shadow support.

2011-05-07 10:21:56 +02:00

vf_fade.c

fade: fix draw_slice() check on fade->factor value

2011-04-25 22:45:44 +02:00

vf_fieldorder.c

vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

2011-04-29 15:00:08 +02:00

vf_fifo.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_format.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_frei0r.c

lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

2011-05-01 13:10:18 +02:00

vf_gradfun.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_hflip.c

hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

2011-04-28 07:25:27 +02:00

vf_hqdn3d.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_libopencv.c

ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX

2011-04-21 10:33:03 +02:00

vf_mp.c

mp: remove unused variable outlink in end_frame

2011-04-21 18:46:03 +02:00

vf_null.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_overlay.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_pad.c

pad: make the filter parametric

2011-04-26 07:43:34 +02:00

vf_pixdesctest.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_scale.c

scale: fix leak occurring when a scale filter is reconfigured

2011-05-02 16:46:24 +02:00

vf_setpts.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_settb.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_showinfo.c

lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

2011-05-01 13:10:18 +02:00

vf_slicify.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_transpose.c

lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

2011-05-01 13:10:18 +02:00

vf_unsharp.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_vflip.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_yadif.c

Merge remote branch 'qatar/master'

2011-04-27 03:51:04 +02:00

vsink_nullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vsrc_buffer.c

vsrc_buffer: during init, print information about timebase and sample aspect ratio

2011-05-07 12:48:19 +02:00

vsrc_buffer.h

vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface

2011-05-07 12:03:59 +02:00

vsrc_color.c

lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

2011-05-01 13:10:18 +02:00

vsrc_movie.c

lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()

2011-05-07 12:03:49 +02:00

vsrc_nullsrc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

yadif.h

Change yadif to not use out of picture lines.

2011-04-03 08:46:19 +02:00