Michael Niedermayer 49891784ce Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  vsrc_buffer: allow buffering arbitrary number of frames.
  vf_scale: avoid a pointless memcpy in no-op conversion.
  avfiltergraph: try to reduce format conversions in filters.
  avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
  id3v2: fix skipping extended header in id3v2.4

Conflicts:
	libavfilter/vf_scale.c
	libavfilter/vsrc_buffer.c
	libavformat/id3v2.c

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

2012-04-02 00:17:02 +02:00

..

libmpcodecs

vf_fspp: add ff_ prefix to non static variables.

2012-03-14 23:06:00 +01:00

x86

Merge remote-tracking branch 'qatar/master'

2012-02-10 01:20:07 +01:00

af_aconvert.c

lavfi/aconvert: use libswresample.

2012-02-02 14:31:18 +01:00

af_aformat.c

lavfi/aformat: use do..while(0) form for macro.

2012-02-02 14:31:17 +01:00

af_amerge.c

lavfi/amerge: copy ref props after filtering samples.

2012-02-02 14:31:18 +01:00

af_anull.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

af_aresample.c

lavfi/aresample: use libswresample.

2012-02-02 14:31:17 +01:00

af_ashowinfo.c

lavfi/ashowinfo: only print checksum for the existing planes

2012-02-14 18:01:57 +01:00

af_asplit.c

lavfi: add asplit filter

2011-12-27 15:21:08 +01:00

af_astreamsync.c

af_astreamsync: remove unused variable

2012-01-01 16:43:32 +01:00

af_earwax.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

af_pan.c

af_pan: remove dual double/int storage of gain.

2012-02-22 10:50:58 +01:00

af_silencedetect.c

lavfi/silencedetect: use av_ts2timestr() macro.

2012-02-15 00:22:47 +01:00

af_volume.c

volume: remove duplicated condition.

2012-01-05 21:53:18 +01: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 tile video filter.

2012-03-21 15:52:45 +01:00

asink_anullsink.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

asrc_abuffer.c

lavfi/abuffer: init the data planes with NULL pointers.

2012-02-21 16:45:34 +01:00

asrc_abuffer.h

lavfi: add asrc_abuffer - audio buffer source

2011-08-21 11:37:57 +02:00

asrc_aevalsrc.c

aevalsrc: add duration option

2011-12-04 21:13:22 +01:00

asrc_anullsrc.c

Merge remote-tracking branch 'qatar/master'

2011-11-26 01:12:08 +01:00

avcodec.c

avfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref().

2012-03-29 04:11:55 +02:00

avcodec.h

lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().

2012-03-26 22:46:40 +02:00

avfilter.c

avfilter: allow freeing NULL.

2012-03-31 08:48:23 +02:00

avfilter.h

Merge remote-tracking branch 'qatar/master'

2012-01-13 01:29:48 +01:00

avfiltergraph.c

Merge remote-tracking branch 'qatar/master'

2012-04-02 00:17:02 +02:00

avfiltergraph.h

Merge remote-tracking branch 'qatar/master'

2012-04-02 00:17:02 +02: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

buffersink.h

buffersink: Implement a poll function.

2011-12-08 21:19:23 +01:00

buffersrc.h

lavfi: add a new function av_buffersrc_buffer().

2011-12-25 16:18:57 +01:00

defaults.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

drawutils.c

drawutils: new API.

2012-03-21 15:52:45 +01:00

drawutils.h

drawutils: new API.

2012-03-21 15:52:45 +01:00

formats.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

gradfun.h

Add some forgotten const to function arguments in libavfilter & libavformat.

2011-05-17 03:05:36 +02:00

graphdump.c

graphdump: use av_bprintf API.

2012-03-21 13:39:28 +01:00

graphparser.c

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

2011-09-28 08:02:53 +02:00

internal.h

avfilter: pool draining and self destruction support.

2012-01-12 16:32:54 +01:00

libavfilter.v

Add symbol versioning for shared libraries

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

Makefile

Merge remote-tracking branch 'qatar/master'

2012-03-26 20:52:52 +02:00

sink_buffer.c

sink_buffer: copy list of provided formats in the context

2011-12-22 10:09:42 +01:00

src_movie.c

lavfi/movie: add loop parameter

2012-03-18 21:19:09 +01:00

transform.c

cleanup: for(int

2011-12-13 21:08:43 +01:00

transform.h

lavfi: add missing header mulitple-inclusion guard in transform.h

2011-10-20 15:59:20 +02:00

version.h

Merge remote-tracking branch 'qatar/master'

2012-04-02 00:17:02 +02:00

vf_aspect.c

lavfi/aspect: check for a negative code from av_parse_ratio()

2012-03-21 15:14:28 +01:00

vf_ass.c

ass: fix aspect ratio computation.

2012-03-28 16:38:15 +02:00

vf_bbox.c

lavfi: add bbox filter

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

vf_blackdetect.c

lavfi: add blackdetect filter

2012-03-04 12:31:06 +01:00

vf_blackframe.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

vf_copy.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_crop.c

lavfi/crop: show input and output sample aspect ratio in the log

2012-03-17 12:34:34 +01:00

vf_cropdetect.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_delogo.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_deshake.c

vf_deshake: try to fix memleak

2012-02-29 02:33:32 +01:00

vf_drawbox.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_drawtext.c

cosmetics: fix some typos

2012-03-13 01:14:04 +01:00

vf_fade.c

lavfi/fade: fix black level for non studio-level pixel formats

2012-03-31 15:55:43 +02:00

vf_fieldorder.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_fifo.c

Fix various if parenthesis misplacements.

2011-11-21 19:35:33 +01:00

vf_format.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

vf_frei0r.c

vf_frei0r: set outlinks sample aspect ratio to 1

2012-03-10 17:48:14 +01:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-02-14 01:53:31 +01:00

vf_hflip.c

vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats

2012-03-26 01:02:18 +02:00

vf_hqdn3d.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_libopencv.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_lut.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

vf_mp.c

lavfi: remove swapuv libmpcodecs wrapper

2012-03-10 00:10:44 +01:00

vf_null.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_overlay.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

vf_pad.c

vf_pad: port to new drawutils API.

2012-03-21 15:52:45 +01:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

2012-02-09 01:27:12 +01:00

vf_scale.c

Merge remote-tracking branch 'qatar/master'

2012-04-02 00:17:02 +02:00

vf_select.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

vf_setfield.c

lavfi: add setfield filter

2012-02-06 20:46:58 +01:00

vf_setpts.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

vf_settb.c

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

vf_showinfo.c

lavfi/showinfo: only print checksum for the existing planes

2012-02-14 18:01:50 +01:00

vf_slicify.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_split.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_swapuv.c

lavfi: port MP swapuv filter

2012-03-10 00:10:37 +01:00

vf_thumbnail.c

vf_thumbnail: forward request_frame at least once.

2012-03-17 17:26:27 +01:00

vf_tile.c

lavfi: add tile video filter.

2012-03-21 15:52:45 +01:00

vf_tinterlace.c

vf_tinterlace: implement interlace mode 5

2012-01-01 16:16:50 +01:00

vf_transpose.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_unsharp.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_vflip.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vf_yadif.c

vf_yadif: accept input with several frames available.

2012-03-07 17:36:04 +01:00

vsink_nullsink.c

Mark AVFilterPad[] compound literals as const.

2011-11-06 00:05:14 +01:00

vsrc_buffer.c

Merge remote-tracking branch 'qatar/master'

2012-04-02 00:17:02 +02:00

vsrc_buffer.h

vsrc_buffer: remove duplicated file description

2011-09-19 12:43:10 +02:00

vsrc_cellauto.c

lavfi: add cellauto source

2011-12-11 11:55:33 +01:00

vsrc_color.c

vsrc_color: port to new drawutils API.

2012-03-21 15:52:45 +01:00

vsrc_life.c

vsrc_life: free option values.

2012-03-03 12:33:54 +01:00

vsrc_mandelbrot.c

lavfi: fix mp and mandelbrot descriptions to make them complete sentences

2012-01-21 14:40:46 +01:00

vsrc_mptestsrc.c

vsrx_mptestsrc: remove duplicate config_props init.

2012-03-07 00:20:23 +01:00

vsrc_testsrc.c

vsrc_testsrc: free option values.

2012-03-03 13:17:39 +01:00

yadif.h

Change yadif to not use out of picture lines.

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