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

* qatar/master:
  avfilter: Log an error if avfilter fails to configure a link.
  avconv: support only native pthreads.
  rtmp: Fix a possible access to invalid memory location when the playpath is too short.

Conflicts:
	ffmpeg.c

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

2012-06-12 20:44:57 +02:00

..

libmpcodecs

add bracket around the argument (fixes compilation error with ICL)

2012-06-09 00:34:21 +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-06-06 01:08:33 +02:00

af_amerge.c

amerge: accept multiple inputs.

2012-06-07 22:51:08 +02:00

af_amix.c

lavfi: remove request/poll and drawing functions from public API on next bump

2012-06-05 09:38:16 +02:00

af_anull.c

af_null: fix copyright

2012-05-24 05:08:48 +02:00

af_aresample.c

af_aresample: fix pts, they where off by a packet in the -async >0 case.

2012-05-26 16:22:46 +02:00

af_ashowinfo.c

lavfi: drop planar/packed negotiation support

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

af_astreamsync.c

af_astreamsync: set samples rate in query_formats.

2012-06-03 10:04:01 +02:00

af_asyncts.c

lavfi: remove request/poll and drawing functions from public API on next bump

2012-06-05 09:38:16 +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: remove request/poll and drawing functions from public API on next bump

2012-06-05 09:38:16 +02:00

af_silencedetect.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +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 remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

asink_anullsink.c

asink_anullsink: fix copyright

2012-05-24 05:08:48 +02:00

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

asrc_anullsrc.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

audio.c

lavfi/audio: fix size of copied samples.

2012-06-07 17:03:45 +02:00

audio.h

lavfi: drop planar/packed negotiation support

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

avcodec.c

lavfi: move avfilter_copy_frame_props() definition from buffer.c to avcodec.c

2012-06-05 18:39:47 +02:00

avcodec.h

Merge remote-tracking branch 'qatar/master'

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

avfilter.c

Merge remote-tracking branch 'qatar/master'

2012-06-12 20:44:57 +02:00

avfilter.h

lavfi: add a frame_rate field to AVFilterLink.

2012-06-09 08:42:50 +02:00

avfiltergraph.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +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

lavfi: move avfilter_copy_frame_props() definition from buffer.c to avcodec.c

2012-06-05 18:39:47 +02:00

bufferqueue.h

lavfi: add a generic API for buffer queues.

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

buffersink.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

buffersink.h

buffersink: add av_buffersink_get_frame_rate().

2012-06-09 08:42:50 +02:00

buffersrc.c

buffersrc: deprecate flat options syntax.

2012-06-09 08:42:50 +02:00

buffersrc.h

lavfi: unify src_buffer and buffersrc.

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

defaults.c

lavfi: deprecate default config_props() callback and refactor avfilter_config_links()

2012-05-22 21:32:57 +02:00

drawutils.c

drawutils: fix copyright

2012-05-24 05:08:49 +02:00

drawutils.h

drawutils: implement uniform and mask blending.

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

formats.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

formats.h

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

gradfun.h

…

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: make ff_null_start_frame_keep_ref() a non static inline function.

2012-06-10 03:08:19 +02:00

lavfutils.c

lavfutils: fix incompatible pointer type warning

2012-05-26 20:45:59 +02:00

lavfutils.h

lavfi: port libmpcodecs remove-logo filter

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

libavfilter.v

libavfilter: export ff_default_query_formats()

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

lswsutils.c

lswsutils: fix "ncompatible pointer type" warning

2012-05-26 20:46:00 +02:00

lswsutils.h

lavfi: port libmpcodecs remove-logo filter

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

Makefile

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

sink_buffer.c

sink_buffer: dont return void from void functions.

2012-06-10 03:30:12 +02:00

split.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

src_buffer.c

lavfi: unify src_buffer and buffersrc.

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

src_movie.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +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

lavfi: remove avfilter_default_item_name() from public API

2012-06-06 23:25:33 +02:00

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_ass.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +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: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

vf_blackframe.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_colormatrix.c

libavfilter: add colormatrix filter

2012-04-04 23:54:53 +02:00

vf_copy.c

Merge remote-tracking branch 'qatar/master'

2012-05-23 21:48:31 +02:00

vf_crop.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_cropdetect.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_delogo.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_deshake.c

vf_deshake: try to fix memleak

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

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_drawtext.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_fade.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_fieldorder.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_fifo.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_format.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_fps.c

vf_fps: set frame_rate.

2012-06-10 10:53:03 +02:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_hflip.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_hqdn3d.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_idet.c

vf_idet: remove unused variables

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

vf_libopencv.c

vf_libopencv: add missing headers.

2012-06-10 08:02:02 +02:00

vf_lut.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_mp.c

lavfi: remove screenshot libmpcodecs wrapper

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

vf_null.c

Merge remote-tracking branch 'qatar/master'

2012-05-23 21:48:31 +02:00

vf_overlay.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_pad.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02: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-06-06 01:08:33 +02:00

vf_select.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02: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-06-06 01:08:33 +02:00

vf_settb.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_showinfo.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_slicify.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02: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

vf_tile: update deprecated functions.

2012-06-10 10:40:33 +02:00

vf_tinterlace.c

lavfi/tinterlace: support symbolic names for the parameter

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

vf_transpose.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_vflip.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vf_yadif.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

video.c

libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.

2012-06-10 03:08:19 +02:00

video.h

libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.

2012-06-10 03:08:19 +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: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

vsrc_color.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

vsrc_life.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

vsrc_mandelbrot.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

vsrc_mptestsrc.c

lavfi: use av_default_item_name() as filter private context logger

2012-06-04 02:40:01 +02:00

vsrc_testsrc.c

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

yadif.h

…