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

* qatar/master:
  x86: Only use optimizations with cmov if the CPU supports the instruction
  x86: Add CPU flag for the i686 cmov instruction
  x86: remove unused inline asm macros from dsputil_mmx.h
  x86: move some inline asm macros to the only places they are used
  lavfi: Add the af_channelmap audio channel mapping filter.
  lavfi: add join audio filter.
  lavfi: allow audio filters to request a given number of samples.
  lavfi: support automatically inserting the fifo filter when needed.
  lavfi/audio: eliminate ff_default_filter_samples().

Conflicts:
	Changelog
	libavcodec/x86/h264dsp_mmx.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/version.h
	libavutil/x86/cpu.c

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

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

..

libmpcodecs

Merge remote-tracking branch 'qatar/master'

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

x86

…

af_aconvert.c

Merge remote-tracking branch 'qatar/master'

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

af_aformat.c

Merge remote-tracking branch 'qatar/master'

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

af_amerge.c

Merge remote-tracking branch 'qatar/master'

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

af_amix.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +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-06-24 02:09:53 +02:00

af_asetnsamples.c

Merge remote-tracking branch 'qatar/master'

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

af_ashowinfo.c

lavfi: drop planar/packed negotiation support

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

af_astreamsync.c

Merge remote-tracking branch 'qatar/master'

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

af_asyncts.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

af_atempo.c

Merge remote-tracking branch 'qatar/master'

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

af_channelmap.c

Merge remote-tracking branch 'qatar/master'

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

af_channelsplit.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

af_earwax.c

lavfi: update some deprecated functions

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

af_join.c

lavfi: add join audio filter.

2012-06-22 21:26:18 +02:00

af_pan.c

Merge remote-tracking branch 'qatar/master'

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

af_resample.c

af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64

2012-06-15 19:10:58 +02:00

af_silencedetect.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

af_volume.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00: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-06-24 02:09:53 +02:00

asink_anullsink.c

Merge remote-tracking branch 'qatar/master'

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

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

asrc_anullsrc.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

audio.c

Merge remote-tracking branch 'qatar/master'

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

audio.h

Merge remote-tracking branch 'qatar/master'

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

avcodec.c

lavfi/avcodec: make avfilter_fill_frame_from*() functions use avfilter_copy_buf_props()

2012-06-19 16:44:36 +02:00

avcodec.h

Merge remote-tracking branch 'qatar/master'

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

avf_showwaves.c

Merge remote-tracking branch 'qatar/master'

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

avfilter.c

lavfi: display pad type with mismatch error message.

2012-06-23 11:34:46 +02:00

avfilter.h

Merge remote-tracking branch 'qatar/master'

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

avfiltergraph.c

Merge remote-tracking branch 'qatar/master'

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

avfiltergraph.h

Merge remote-tracking branch 'qatar/master'

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

bbox.c

…

bbox.h

…

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-06-24 02:09:53 +02:00

buffersink.h

buffersink: add av_buffersink_get_frame_rate().

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

buffersrc.c

lavfi/buffer: remove unused function av_vsrc_buffer_add_frame_alt()

2012-06-23 00:42:51 +02:00

buffersrc.h

lavfi: unify src_buffer and buffersrc.

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

defaults.c

Merge remote-tracking branch 'qatar/master'

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

drawutils.c

lavfi: update some deprecated functions

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

drawutils.h

…

fifo.c

Merge remote-tracking branch 'qatar/master'

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

formats.c

Merge remote-tracking branch 'qatar/master'

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

formats.h

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +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-06-13 22:43:57 +02:00

internal.h

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +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-06-24 02:09:53 +02:00

sink_buffer.c

Merge remote-tracking branch 'qatar/master'

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

split.c

lavfi/asplit: fix memleak

2012-06-20 12:37:50 +02:00

src_buffer.c

lavfi: unify src_buffer and buffersrc.

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

src_movie.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +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

Merge remote-tracking branch 'qatar/master'

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

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

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

vf_ass.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_bbox.c

lavfi: update some deprecated functions

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

vf_blackdetect.c

Merge remote-tracking branch 'qatar/master'

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

vf_blackframe.c

Merge remote-tracking branch 'qatar/master'

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

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

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

vf_colormatrix.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00: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-13 22:43:57 +02:00

vf_cropdetect.c

Merge remote-tracking branch 'qatar/master'

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

vf_delogo.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_deshake.c

lavfi/deshake: fix crash in uninit()

2012-06-21 17:01:44 +02:00

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

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

vf_drawtext.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_fade.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_fieldorder.c

Merge remote-tracking branch 'qatar/master'

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

vf_format.c

Merge remote-tracking branch 'qatar/master'

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

vf_fps.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_frei0r.c

lavfi: remove redundant checks after av_parse_video_rate()

2012-06-20 20:36:12 +00:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +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-13 22:43:57 +02:00

vf_idet.c

Merge remote-tracking branch 'qatar/master'

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

vf_libopencv.c

vf_libopencv: add missing headers.

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

vf_lut.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_mp.c

Merge remote-tracking branch 'qatar/master'

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

vf_null.c

Merge remote-tracking branch 'qatar/master'

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

vf_overlay.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vf_pad.c

vf_pad: check that we have write permission before writing in the buffer.

2012-06-16 01:54:50 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

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

vf_removelogo.c

lavfi: update some deprecated functions

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

vf_scale.c

lavfi/scale: remove unused variable out_link

2012-06-21 12:47:48 +02:00

vf_select.c

lavfi: update some deprecated functions

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

vf_setfield.c

lavfi: update some deprecated functions

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

vf_setpts.c

Merge remote-tracking branch 'qatar/master'

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

vf_settb.c

Merge remote-tracking branch 'qatar/master'

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

vf_showinfo.c

lavfi: make AVFilterPad opaque after two major bumps.

2012-06-13 11:11:33 +02:00

vf_slicify.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +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

Merge remote-tracking branch 'qatar/master'

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

vf_tile.c

Merge remote-tracking branch 'qatar/master'

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

vf_tinterlace.c

Merge remote-tracking branch 'qatar/master'

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

vf_transpose.c

Merge remote-tracking branch 'qatar/master'

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

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +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-06-13 22:43:57 +02:00

video.c

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +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_buffer.h

buffersrc: add av_buffersrc_write_frame().

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

vsrc_cellauto.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vsrc_color.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vsrc_life.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vsrc_mandelbrot.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vsrc_mptestsrc.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

vsrc_testsrc.c

lavfi: define macro AVFILTER_DEFINE_CLASS

2012-06-22 23:11:43 +02:00

yadif.h

…