Alexander Strasser dcd1acce1a configure: Special case libfreetype test ...

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

(cherry picked from commit cea5812fa7)

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

Conflicts:
	configure

2013-12-29 11:37:29 +01:00

..

libmpcodecs

lavfi/mp: drop mp=stereo3d filter

2013-03-05 18:45:35 +00:00

x86

Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

2013-02-16 09:09:38 +01:00

af_aconvert.c

lavfi/af_aconvert: update audio->channels.

2012-12-20 17:01:35 +01:00

af_afade.c

afade filter

2013-01-21 15:20:42 +00:00

af_aformat.c

lavfi/af_aformat: accept unknown channel layouts.

2013-01-26 11:15:38 +01:00

af_amerge.c

libavfilter/af_amerge: fix segfault if init fails.

2013-02-24 11:23:51 +01:00

af_amix.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_anull.c

lavfi/af_anull: accept unknown channel layouts.

2013-01-26 11:15:38 +01:00

af_apad.c

af_apad: remove unneeded av_opt_free

2012-12-18 17:31:01 +01:00

af_aresample.c

lavfi/af_aresample: fix info log for unknown layouts.

2013-02-28 19:23:12 +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

Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

2012-12-14 15:56:56 +01:00

af_atempo.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

af_biquads.c

af_biquads: memset(0) cache

2013-02-25 04:39:26 +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

avfilter/af_earwax: Fix out of array accesses on odd packets

2013-07-10 19:07:10 +02:00

af_join.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_pan.c

lavfi: add a channels field to AVFilterLink.

2012-12-20 13:03:41 +01:00

af_resample.c

lavfi: connect libavresample options to af_resample via AVFilterGraph

2013-02-23 17:07:54 -05:00

af_silencedetect.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

af_volume.c

lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c

2012-12-08 15:40:07 +01:00

af_volume.h

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

af_volumedetect.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

all_channel_layouts.inc

lavfi: rename all_channel_layouts.h to all_channel_layouts.inc.

2012-05-18 23:34:11 +02:00

allfilters.c

lavfi: port MP stereo3d filter

2013-03-05 18:36:40 +00:00

asink_anullsink.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

asrc_abuffer.h

asrc_abuffer: deprecate the header.

2012-05-06 16:18:10 +02:00

asrc_aevalsrc.c

lavfi/aevalsrc: try to honor specified duration

2013-01-12 17:26:35 +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

lavfi: support unknown channel layouts.

2013-01-26 11:15:38 +01:00

audio.h

libavfilter: Support using filter_frame for video

2012-11-28 16:43:34 +01:00

avcodec.c

avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels

2013-01-28 21:45:16 +01:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

avf_concat.c

avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use.

2012-12-29 18:56:33 +01:00

avf_showspectrum.c

lavf/showspectrum: add divVerent in the (c) for his recent work on the filter.

2013-02-18 13:34:37 +01:00

avf_showwaves.c

lavfi/showwaves: fail in case of push_frame() error

2013-01-25 19:35:21 +01:00

avfilter.c

avfilter: Silence warning: passing argument 3 of av_image_copy from incompatible pointer type

2013-02-23 12:08:05 +01:00

avfilter.h

lavfi/avfilter: remove now unused {src,cur,out}_buf.

2013-01-06 04:14:56 +01:00

avfiltergraph.c

Remove incorrect use of ctype.h functions.

2013-03-03 21:44:10 +01:00

avfiltergraph.h

avfilter/avfiltergraph.h: Move public field out of the private fields

2013-02-24 20:31:56 +01:00

bbox.c

bbox: remove superfluous initializations

2012-03-22 13:40:37 +01:00

bbox.h

lavfi: add bbox filter

2012-03-17 11:21:49 +01:00

buffer.c

ff_copy_buffer_ref: use the channel count

2012-12-12 14:12:47 +01:00

bufferqueue.h

lavfi/bufferqueue: add ff_bufqueue_is_full().

2013-01-31 21:03:54 +01:00

buffersink.c

buffersink: switch to filter_frame

2012-11-29 01:55:26 +01:00

buffersink.h

lavfi/abuffersink: add sample_rates field to AVABufferSinkParams

2013-02-24 23:21:28 +01:00

buffersrc.c

lavfi/buffersrc: set channel layout if it is known.

2013-02-21 12:36:35 +01:00

buffersrc.h

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45: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/ebur128: advance pointer to samples

2013-02-15 16:39:25 +01:00

f_select.c

lavfi/select: correctly set prev_t and prev_pts

2013-02-07 21:28:46 +01:00

f_sendcmd.c

lavfi/sendcmd: switch to filter_frame API

2012-12-08 12:10:40 +01:00

f_setpts.c

Merge remote-tracking branch 'qatar/master'

2013-01-25 15:04:41 +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

lavfi/formats: reindent after last commit.

2013-02-24 12:05:06 +01: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

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

2012-11-13 13:21:21 +00:00

graphparser.c

Remove incorrect use of ctype.h functions.

2013-03-03 21:44:10 +01:00

internal.h

internal.h: remove start/end_frame from AVFilterPad

2013-01-05 23:36:09 +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

libavfilter: export ff_default_query_formats()

2012-05-25 18:54:01 +02:00

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

Makefile

lavfi/mp: drop mp=stereo3d filter

2013-03-05 18:45:35 +00:00

sink_buffer.c

lavfi/abuffersink: fix weird indent and spacing

2013-02-24 23:22:23 +01:00

split.c

libavfilter/split: switch to filter_frame

2012-11-29 01:20:53 +01:00

src_buffer.c

lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels.

2013-01-01 02:01:28 +01:00

src_movie.c

src_movie: fix scanf string

2013-05-09 21:01:03 +02: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

lavfi/deshake: support named options.

2013-03-05 21:16:54 +01:00

vf_alphaextract.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_alphamerge.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_aspect.c

avfilter: fix segfault with setsar/dar

2013-02-20 12:34:05 +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_blend.c

blend filter

2013-02-21 20:16:23 +00:00

vf_boxblur.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02: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

lavfi/crop: fix help message for the keep_aspect option

2013-02-02 15:32:34 +01:00

vf_cropdetect.c

vf_cropdetect: switch to filter_frame

2012-11-29 00:15:56 +01:00

vf_decimate.c

lavfi/decimate: use named options

2013-02-20 19:07:48 +01:00

vf_delogo.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_deshake.c

lavfi/deshake: support named options.

2013-03-05 21:16:54 +01:00

vf_drawbox.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_drawtext.c

configure: Special case libfreetype test

2013-12-29 11:37:29 +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: use AVPixFmtDescriptor to find out if pixel format have alpha

2013-01-18 22:51:05 +00:00

vf_field.c

lavfi/field: switch to filter_frame API

2012-12-06 13:51:34 +01:00

vf_fieldorder.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_format.c

vf_format: switch to filter_frame

2012-11-29 02:09:40 +01:00

vf_fps.c

avfilter/vf_fps: make sure the fifo is not empty before using it

2013-10-03 01:04:18 +02:00

vf_framestep.c

lavfi/framestep: switch to ff_filter_frame API

2012-12-02 15:02:05 +01:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

2012-12-31 14:20:01 +01:00

vf_geq.c

lavfi/geq: improve support for formats with alpha plane

2013-02-25 12:54:40 +00:00

vf_gradfun.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_hflip.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_histeq.c

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

vf_histogram.c

lavfi/histogram: overlay display mode for levels histogram mode

2013-02-18 20:13:07 +00:00

vf_hqdn3d.c

Merge remote-tracking branch 'qatar/master'

2013-02-02 13:18:01 +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 after previous commit

2013-02-20 11:29:12 +01:00

vf_idet.c

vf_idet: adapt default scores due to bugfix

2013-02-21 01:58:07 +01:00

vf_il.c

lavfi/il: filter out hwaccels formats from the list of supported formats

2013-02-10 21:00:56 +01:00

vf_kerndeint.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_libopencv.c

lavfi/opencv: isgraph -> av_isgraph.

2013-03-03 22:06:48 +01:00

vf_lut.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_mp.c

lavfi/mp: drop mp=stereo3d filter

2013-03-05 18:45:35 +00:00

vf_noise.c

lavfi/noise: switch to AVLFG noise generator

2013-02-17 21:45:21 +00:00

vf_null.c

vf_null: switch to filter_frame

2012-11-29 02:09:01 +01:00

vf_overlay.c

lavfi/overlay: improve log message warning in case of clipped overlay

2013-03-05 20:09:50 +01:00

vf_pad.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_pixdesctest.c

vf_pixdesctest: switch to filter_frame

2012-11-28 20:25:55 +01:00

vf_pp.c

lavfi: add pp filter.

2012-12-23 19:03:36 +01:00

vf_removelogo.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_scale.c

lavfi/scale: remove usage of link->cur_buf.

2012-12-26 21:30:45 +01:00

vf_setfield.c

lavfi/setfield: add support to named options and introspection

2012-12-08 18:26:32 +01:00

vf_showinfo.c

avfilter: fix plane validity checks

2013-08-25 19:50:54 +02:00

vf_smartblur.c

lavfi/smartblur: switch to filter_frame.

2012-11-29 12:49:03 +01:00

vf_stereo3d.c

vf_stereo3d: Add AVOption table terminator

2013-03-05 22:29:57 +01:00

vf_subtitles.c

lavfi/subtitles: zero-init AVSubtitle.

2013-05-09 17:05:02 +02:00

vf_super2xsai.c

lavfi/vf_super2xsai: fix output ref size.

2012-12-02 17:08:17 +01:00

vf_swapuv.c

lavfi/swapuv: support all planar yuv pixel formats

2013-01-23 16:13:23 +00: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/tile: small align cosmetics.

2012-12-26 21:32:38 +01:00

vf_tinterlace.c

vf_tinterlace: fix logical/bit op mixup

2013-01-06 04:38:53 +01:00

vf_transpose.c

lavfi/transpose: support more pix fmts

2013-02-13 16:29:47 +00:00

vf_unsharp.c

lavfi/unsharp: add missing NULL check

2013-02-17 11:48:31 +01:00

vf_vflip.c

vflip: switch to filter_frame

2012-11-29 00:09:31 +01:00

vf_yadif.c

yadif: remove unused variable

2013-02-16 13:24:43 +01:00

video.c

lavfi: merge all filtering code into ff_filter_frame.

2013-01-01 15:19:04 +01:00

video.h

libavfilter/video.h: remove unused things related to the start/slice/end API

2013-01-05 23:36:09 +01:00

vsink_nullsink.c

vsink_nullsink: switch to filter_frame

2012-11-28 21:49:04 +01:00

vsrc_cellauto.c

Remove incorrect use of ctype.h functions.

2013-03-03 21:44:10 +01:00

vsrc_life.c

Remove incorrect use of ctype.h functions.

2013-03-03 21:44:10 +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

vsrc_testsrc: Fix assignments in if()

2013-01-14 05:05:40 +01:00

yadif.h

Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

2013-02-16 09:09:38 +01:00