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

* qatar/master:
  mss3: use standard zigzag table
  mss3: split DSP functions that are used in MTS2(MSS4) into separate file
  motion-test: do not use getopt()
  tcp: add initial timeout limit for incoming connections
  configure: Change the rdtsc check to a linker check
  avconv: propagate fatal errors from lavfi.
  lavfi: add error handling to filter_samples().
  fate-run: make avconv() properly deal with multiple inputs.
  asplit: don't leak the input buffer.
  af_resample: fix request_frame() behavior.
  af_asyncts: fix request_frame() behavior.
  libx264: support aspect ratio switching
  matroskadec: honor error_recognition when encountering unknown elements.
  lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
  lavr: resampling: add filter type and Kaiser window beta to AVOptions
  lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
  lavr: mix: validate internal sample format in ff_audio_mix_init()

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/libx264.c
	libavfilter/audio.c
	libavfilter/split.c
	libavformat/tcp.c
	tests/fate-run.sh

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

2012-07-09 22:40:12 +02:00

..

libmpcodecs

vf_pp: dont pass NULL into pp, it would fail

2012-07-07 19:14:51 +02:00

x86

Merge remote-tracking branch 'qatar/master'

2012-07-04 00:32:31 +02:00

af_aconvert.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_aformat.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

af_amerge.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_amix.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_anull.c

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +02:00

af_aresample.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_asetnsamples.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_ashowinfo.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_astreamsync.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_asyncts.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_atempo.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_channelmap.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_channelsplit.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_earwax.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_join.c

lavfi: add error handling to filter_samples().

2012-07-09 08:25:19 +02:00

af_pan.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_resample.c

lavfi: add error handling to filter_samples().

2012-07-09 08:25:19 +02:00

af_silencedetect.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_volume.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +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

lavfi: implement asettb filter.

2012-07-08 19:54:08 +02:00

asink_anullsink.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

asrc_anullsrc.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

audio.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

audio.h

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

avcodec.c

lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API

2012-06-25 13:42:47 +02:00

avcodec.h

lavfi: remove vsrc_buffer.h API

2012-07-03 01:32:16 +02:00

avf_showwaves.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

avfilter.c

lavfi: implement samples framing on links.

2012-06-30 14:03:54 +02:00

avfilter.h

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

avfiltergraph.c

Suggest aresample filter if it was not compiled but requested.

2012-07-03 21:35:20 +02:00

avfiltergraph.h

Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

2012-06-27 00:34:36 +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 definition of avfilter_copy_buf_props() from buffer.c to avcodec.c

2012-06-13 10:51:33 +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-07-09 22:40:12 +02:00

buffersink.h

sink_buffer: implement fixed frame size.

2012-06-30 14:03:54 +02:00

buffersrc.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

buffersrc.h

lavfi: deprecate av_buffersrc_buffer() function

2012-06-28 22:27:05 +02:00

defaults.c

lavfi: drop deprecated and disabled packing API

2012-06-26 11:40:21 +02:00

drawutils.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00:00

drawutils.h

drawutils: implement uniform and mask blending.

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

f_settb.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

fifo.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

filtfmts.c

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

formats.c

Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

2012-06-27 00:34:36 +02:00

formats.h

Merge remote-tracking branch 'qatar/master'

2012-07-04 00:32:31 +02:00

gradfun.h

Merge remote-tracking branch 'qatar/master'

2012-07-02 21:19:41 +02:00

graphdump.c

lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h

2012-06-25 13:42:37 +02:00

graphparser.c

Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

2012-06-27 00:34:36 +02:00

internal.h

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +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

vf_settb: rename the file as f_settb.

2012-07-08 19:54:08 +02:00

sink_buffer.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

split.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

src_buffer.c

lavfi: remove vsrc_buffer.h API

2012-07-03 01:32:16 +02:00

src_movie.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

transform.c

libavfilter/transform: fix mirroring.

2012-06-20 23:55:17 +02:00

transform.h

lavfi/transform: fix make checkheaders.

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

version.h

lavfi: implement asettb filter.

2012-07-08 19:54:08 +02:00

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_ass.c

vf_ass: fix table name to refer to correct lib.

2012-06-29 11:28:34 +02:00

vf_bbox.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_blackdetect.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_blackframe.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_boxblur.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_colormatrix.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_copy.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

vf_crop.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_cropdetect.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_delogo.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_deshake.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_drawtext.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_fade.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_fieldorder.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_format.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_fps.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-07-02 21:19:41 +02:00

vf_hflip.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00:00

vf_hqdn3d.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_idet.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_libopencv.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_lut.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_mp.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_null.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

vf_overlay.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_pad.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

vf_removelogo.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_scale.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_select.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_setfield.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_setpts.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_showinfo.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_slicify.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

vf_super2xsai.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00:00

vf_swapuv.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00:00

vf_thumbnail.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vf_tile.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vf_tinterlace.c

vf_tinterlace: use av_assert

2012-07-08 03:47:38 +02:00

vf_transpose.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vf_vflip.c

vf_vflip: fix handling of the last line.

2012-06-20 20:14:01 +02:00

vf_yadif.c

Merge remote-tracking branch 'qatar/master'

2012-07-02 21:19:41 +02:00

video.c

Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

2012-06-27 00:34:36 +02:00

video.h

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

vsink_nullsink.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

vsrc_cellauto.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vsrc_color.c

Merge remote-tracking branch 'qatar/master'

2012-06-27 01:58:09 +02:00

vsrc_life.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vsrc_mandelbrot.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vsrc_mptestsrc.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vsrc_testsrc.c

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

yadif.h

Merge remote-tracking branch 'qatar/master'

2012-07-02 21:19:41 +02:00