Michael Niedermayer 7fff5781b6 Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b' ...

* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
  vf_showinfo: remove its useless init function
  AVOptions: fix using named constants with child contexts.

Conflicts:
	libavutil/opt.c

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

2013-03-16 16:38:11 +01:00

..

libmpcodecs

lavfi/mp: drop mp=stereo3d filter

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

x86

yadif: restore speed of the C filtering code

2013-03-13 22:07:25 +01:00

af_aconvert.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_afade.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_aformat.c

lavfi/af_aformat: accept unknown channel layouts.

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

af_amerge.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_amix.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_anull.c

lavfi/af_anull: accept unknown channel layouts.

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

af_apad.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_aresample.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_asetnsamples.c

lavfi/asetnsamples: raise filter_frame() error.

2013-03-13 19:00:08 +01:00

af_ashowinfo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_astreamsync.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_asyncts.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_atempo.c

lavfi/atempo: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

af_biquads.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_channelmap.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

af_channelsplit.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_earwax.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_join.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_pan.c

avfilter: avoid direct access to AVFrame.channels

2013-03-15 16:13:53 +01:00

af_resample.c

lavfi: switch to AVFrame.

2013-03-08 07:37:18 +01:00

af_silencedetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_volume.c

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

af_volume.h

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

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

af_volumedetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01: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: add perms and aperms filters.

2013-03-16 16:04:59 +01:00

asink_anullsink.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

lavfi/aevalsrc: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

asrc_anullsrc.c

lavfi/anullsrc: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

asrc_flite.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

audio.c

avfilter: avoid direct access to "frame"->channels

2013-03-10 11:25:54 +01:00

audio.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avcodec.c

lavfi/avcodec: fix API version checks

2013-03-13 22:18:02 +01:00

avcodec.h

lavfi/avcodec: fix API version checks

2013-03-13 22:18:02 +01:00

avf_concat.c

lavfi/concat: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

avf_showspectrum.c

lavfi/showspectrum: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

avf_showwaves.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avfilter.c

lavfi: use designated initializers in avfilter_class

2013-03-16 05:33:06 +01:00

avfilter.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avfiltergraph.c

Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'

2013-03-16 16:28:27 +01:00

avfiltergraph.h

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

bbox.c

…

bbox.h

…

buffer.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

bufferqueue.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

buffersink.c

lavfi/buffersink: schedule removing the "ff" variants.

2013-03-12 23:31:07 +01:00

buffersink.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

buffersrc.c

lavfi/buffersrc: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

buffersrc.h

lavfi/buffersrc: implement flags.

2013-03-10 13:56:17 +01: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: check histogram allocations.

2013-03-15 02:58:29 +01:00

f_perms.c

lavfi: add perms and aperms filters.

2013-03-16 16:04:59 +01:00

f_select.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

f_sendcmd.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

f_setpts.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

f_settb.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

fifo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +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

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

graphparser.c

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

internal.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +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: add perms and aperms filters.

2013-03-16 16:04:59 +01:00

split.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

src_movie.c

lavfi/movie: raise filter_frame() error.

2013-03-13 19:00:09 +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 '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

vf_alphaextract.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_alphamerge.c

lavfi/alphamerge: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

vf_aspect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_bbox.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_blackdetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_blackframe.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_blend.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_boxblur.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_colormatrix.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_copy.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_crop.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_cropdetect.c

lavfi/cropdetect: add support for named options

2013-03-13 20:38:54 +01:00

vf_curves.c

lavfi: add curves filter.

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

vf_decimate.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_delogo.c

lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.

2013-03-13 19:00:10 +01:00

vf_deshake.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_drawbox.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_drawtext.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_edgedetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_fade.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_field.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_fieldorder.c

lavfi/fieldorder: add support to named options

2013-03-13 00:37:13 +01:00

vf_format.c

vf_format: switch to filter_frame

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

vf_fps.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_framestep.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_frei0r.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_geq.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_gradfun.c

Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'

2013-03-13 13:34:06 +01:00

vf_hflip.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_histeq.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_histogram.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_hqdn3d.c

Merge remote-tracking branch 'qatar/master'

2013-03-13 14:49:00 +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.

2013-03-10 02:13:02 +01:00

vf_idet.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_il.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_kerndeint.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_libopencv.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_lut.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_mp.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_noise.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_null.c

vf_null: switch to filter_frame

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

vf_overlay.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_pad.c

vf_pad: fix a & instead of && typo

2013-03-10 11:16:10 +01:00

vf_pixdesctest.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_pp.c

vf_pp: use new API to access qp table

2013-03-15 03:02:27 +01:00

vf_removelogo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_scale.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_setfield.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_showinfo.c

Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

2013-03-16 16:38:11 +01:00

vf_smartblur.c

lavfi/smartblur: add support to named options

2013-03-10 16:38:45 +01:00

vf_stereo3d.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_subtitles.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_super2xsai.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_swapuv.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_thumbnail.c

lavfi/thumbnail: support flushing.

2013-03-14 00:14:19 +01:00

vf_tile.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_tinterlace.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_transpose.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_unsharp.c

lavfi/unsharp: add missing option flags

2013-03-10 13:22:58 +01:00

vf_vflip.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_yadif.c

yadif: correct strides in filter_edges_16bit

2013-03-15 19:10:55 +01:00

video.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

video.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsink_nullsink.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_cellauto.c

lavfi/cellauto: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

vsrc_life.c

lavfi/life: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

vsrc_mandelbrot.c

lavfi/mandelbrot: raise filter_frame() error.

2013-03-13 19:00:09 +01:00

vsrc_mptestsrc.c

lavfi/mptestsrc: raise filter_frame() error.

2013-03-13 19:00:10 +01:00

vsrc_testsrc.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

yadif.h

yadif: restore speed of the C filtering code

2013-03-13 22:07:25 +01:00