Michael Niedermayer 040a796dab Merge commit '755cd4197d53946208e042f095b930dca18d9430' ...

* commit '755cd4197d53946208e042f095b930dca18d9430':
  mov: enable parsing for VC-1.
  lavfi: Add fps filter.
  lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
  avconv: add support for audio in complex filtergraphs.

Conflicts:
	ffmpeg.c
	libavfilter/version.h
	libavformat/mov.c
	tests/ref/fate/vc1-ism

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

2012-05-19 20:31:24 +02:00

..

libmpcodecs

lavfi: remove screenshot libmpcodecs wrapper

2012-05-02 18:15:29 +02:00

x86

Merge remote-tracking branch 'qatar/master'

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

af_aconvert.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

af_aformat.c

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

af_amerge.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

af_anull.c

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

af_aresample.c

af_aresample: use new swr API to pass and compensate PTS

2012-05-19 19:23:38 +02:00

af_ashowinfo.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

af_astreamsync.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

af_asyncts.c

lavfi: add asyncts filter.

2012-05-14 21:36:11 +02:00

af_earwax.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

af_pan.c

pan: use ff_parse_channel_layout() instead of av_get_channel_layout().

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

af_resample.c

lavfi: add channel layout/sample rate negotiation.

2012-05-14 21:36:10 +02:00

af_silencedetect.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

af_volume.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02: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

Merge commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +02:00

asink_anullsink.c

Mark AVFilterPad[] compound literals as const.

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

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

lavfi/aevalsrc: reindent after the previous commit

2012-05-18 00:59:42 +02:00

asrc_anullsrc.c

lavfi: remove audio.h include from avfilter.h.

2012-05-12 17:59:41 +02:00

audio.c

Merge commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +02:00

audio.h

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

avcodec.c

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

avcodec.h

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

avfilter.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

avfilter.h

avfilter: make AVFilterFormats compatible with libav.

2012-05-19 15:30:51 +02:00

avfiltergraph.c

avfiltergraph: use aresample not aconvert in the alternative merge code.

2012-05-17 13:11:13 +02:00

avfiltergraph.h

lavfi: add avfilter_graph_set_auto_convert().

2012-05-14 21:29:58 +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

buffer.c

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

buffersink.c

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

buffersink.h

lavfi/buffersink: typo fix in a comment.

2012-05-19 12:28:59 +02:00

buffersrc.c

lavfi: unify src_buffer and buffersrc.

2012-05-19 10:59:52 +02:00

buffersrc.h

lavfi: unify src_buffer and buffersrc.

2012-05-19 10:59:52 +02:00

defaults.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

drawutils.c

Mark GRAY8 format as pseudo-paletted.

2012-04-09 17:21:35 +02:00

drawutils.h

drawutils: implement uniform and mask blending.

2012-04-04 16:16:09 +02:00

f_split.c

f_split: fix output type.

2012-05-19 19:23:37 +02:00

formats.c

avfilter: make AVFilterFormats compatible with libav.

2012-05-19 15:30:51 +02:00

formats.h

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

gradfun.h

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

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

graphdump.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

graphparser.c

Merge remote-tracking branch 'qatar/master'

2012-04-17 12:13:22 +02:00

internal.h

libavfilter: add ff_parse_time_base()

2012-05-17 02:55:57 +02:00

lavfutils.c

lavfutils: ff_load_image: Initialize context

2012-05-11 15:07:26 +02:00

lavfutils.h

lavfi: port libmpcodecs remove-logo filter

2012-04-07 13:57:39 +02:00

libavfilter.v

Add symbol versioning for shared libraries

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

lswsutils.c

lavfi: port libmpcodecs remove-logo filter

2012-04-07 13:57:39 +02:00

lswsutils.h

lavfi: port libmpcodecs remove-logo filter

2012-04-07 13:57:39 +02:00

Makefile

Merge commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +02:00

sink_buffer.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

src_buffer.c

lavfi: unify src_buffer and buffersrc.

2012-05-19 10:59:52 +02:00

src_movie.c

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

transform.c

cleanup: for(int

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

transform.h

lavfi/transform: fix make checkheaders.

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

version.h

Merge commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +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

vf_ass: use drawutils.

2012-04-04 16:16:10 +02:00

vf_bbox.c

lavfi: create buffer reference in filters which need to access the ref later

2012-04-27 21:38:13 +02:00

vf_blackdetect.c

lavfi: create buffer reference in filters which need to access the ref later

2012-04-27 21:38:13 +02:00

vf_blackframe.c

lavfi: create buffer reference in filters which need to access the ref later

2012-04-27 21:38:13 +02:00

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

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

vf_colormatrix.c

libavfilter: add colormatrix filter

2012-04-04 23:54:53 +02: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

lavfi/drawbox: fix width displayed in place of x.

2012-04-13 23:15:54 +02:00

vf_drawtext.c

lavfi/drawtext: give a new alias "timecode_rate" to the the r/rate option

2012-05-03 10:29:08 +02: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_fps.c

lavfi: Add fps filter.

2012-05-18 19:33:54 +02: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_idet.c

vf_idet: remove unused variables

2012-05-10 20:07:23 +02:00

vf_libopencv.c

Mark AVFilterPad[] compound literals as const.

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

vf_lut.c

vf_lut: fix pointer type (const) warning

2012-05-10 20:09:37 +02:00

vf_mp.c

lavfi: remove screenshot libmpcodecs wrapper

2012-05-02 18:15:29 +02: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-04-10 22:53:25 +02:00

vf_pad.c

Mark GRAY8 format as pseudo-paletted.

2012-04-09 17:21:35 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

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

vf_removelogo.c

Fix a few @file doxy inconsistencies.

2012-05-04 18:50:59 +02:00

vf_scale.c

Merge remote-tracking branch 'qatar/master'

2012-04-10 22:53:25 +02:00

vf_select.c

Merge remote-tracking branch 'qatar/master'

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

vf_setfield.c

lavfi/setfield: remove stray argument in av_log()

2012-04-21 12:32:50 +02: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: create buffer reference in filters which need to access the ref later

2012-04-27 21:38:13 +02:00

vf_slicify.c

Mark AVFilterPad[] compound literals as const.

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

vf_super2xsai.c

lavfi: port 2xsai filter from libmpcodecs

2012-04-13 00:14:06 +02: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

lavfi/tinterlace: support symbolic names for the parameter

2012-04-30 23:04:46 +02:00

vf_transpose.c

Mark AVFilterPad[] compound literals as const.

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

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

2012-04-05 22:26:50 +02:00

vf_vflip.c

Mark AVFilterPad[] compound literals as const.

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

vf_yadif.c

Merge remote-tracking branch 'qatar/master'

2012-05-16 02:27:31 +02:00

video.c

Merge commit '755cd4197d53946208e042f095b930dca18d9430'

2012-05-19 20:31:24 +02:00

vsink_nullsink.c

Mark AVFilterPad[] compound literals as const.

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

vsrc_buffer.h

buffersrc: add av_buffersrc_write_frame().

2012-05-14 21:36:11 +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