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

* qatar/master:
  lavr: fix handling of custom mix matrices
  fate: force pix_fmt in lagarith-rgb32 test
  fate: add tests for lagarith lossless video codec.
  ARMv6: vp8: fix stack allocation with Apple's assembler
  ARM: vp56: allow inline asm to build with clang
  fft: 3dnow: fix register name typo in DECL_IMDCT macro
  x86: dct32: port to cpuflags
  x86: build: replace mmx2 by mmxext
  Revert "wmapro: prevent division by zero when sample rate is unspecified"
  wmapro: prevent division by zero when sample rate is unspecified
  lagarith: fix color plane inversion for YUY2 output.
  lagarith: pad RGB buffer by 1 byte.
  dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.

Conflicts:
	doc/APIchanges
	libavcodec/lagarith.c
	libavfilter/x86/gradfun.c
	libavutil/cpu.h
	libavutil/version.h
	libswscale/utils.c
	libswscale/version.h
	libswscale/x86/yuv2rgb.c

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

2012-08-04 23:51:43 +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-08-04 23:51:43 +02:00

af_aconvert.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_aformat.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

af_amerge.c

amerge/astreamsync/pan: fix license boilerplate.

2012-08-03 00:24:51 +02:00

af_amix.c

Merge remote-tracking branch 'qatar/master'

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

af_anull.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

af_aresample.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_asetnsamples.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_ashowinfo.c

Merge remote-tracking branch 'qatar/master'

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

af_astreamsync.c

amerge/astreamsync/pan: fix license boilerplate.

2012-08-03 00:24:51 +02:00

af_asyncts.c

Merge remote-tracking branch 'qatar/master'

2012-07-30 23:28:31 +02:00

af_atempo.c

Merge remote-tracking branch 'qatar/master'

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

af_channelmap.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +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: use avfilter_unref_bufferp() where appropriate.

2012-07-22 09:14:05 +02:00

af_pan.c

amerge/astreamsync/pan: fix license boilerplate.

2012-08-03 00:24:51 +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

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

all_channel_layouts.inc

…

allfilters.c

lavfi: add flite audio source

2012-07-28 11:06:43 +02:00

asink_anullsink.c

lavfi: use const for AVFilterPad declarations in all filters.

2012-07-21 16:31:15 -07:00

asrc_abuffer.h

…

asrc_aevalsrc.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

asrc_anullsrc.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

asrc_flite.c

asrc_flite: do not crash on multiple instances.

2012-07-28 15:13:46 +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: rename picref->samplesref variable in avfilter_get_audio_buffer_ref_from_frame()

2012-07-30 00:33:13 +02:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

avf_concat.c

avf_concat: fix silence duration.

2012-07-28 15:14:01 +02:00

avf_showwaves.c

lavfi/showwaves: do not set on outlink->out_buf the sent video frame

2012-07-23 15:10:19 +02:00

avfilter.c

avfilter: Fix printf format string conversion specifier

2012-07-25 09:24:25 +02:00

avfilter.h

lavfi: document the constraints on incoming frames.

2012-08-04 21:49:05 +02:00

avfiltergraph.c

Merge remote-tracking branch 'qatar/master'

2012-07-27 23:42:19 +02:00

avfiltergraph.h

lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy

2012-07-18 17:13:00 +02:00

bbox.c

…

bbox.h

…

buffer.c

lavfi: add avfilter_unref_bufferp()

2012-07-20 21:06:18 +02:00

bufferqueue.h

…

buffersink.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

buffersink.h

sink_buffer: implement fixed frame size.

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

buffersrc.c

buffersrc: use avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

buffersrc.h

lavfi: deprecate av_buffersrc_buffer() function

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

drawutils.c

lavfi/drawutils: make ff_draw_color() accept a const rgba map

2012-08-02 12:32:48 +02:00

drawutils.h

lavfi/drawutils: make ff_draw_color() accept a const rgba map

2012-08-02 12:32:48 +02:00

f_settb.c

lavfi/asettb: do not create a new reference in filter_samples()

2012-07-31 13:15:51 +02:00

fifo.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +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

Fix misspellings of FFmpeg

2012-07-19 18:44:46 +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-22 23:56:21 +02:00

lavfutils.c

…

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

Makefile

lavfi: move color filter to testsrc, factorize

2012-08-03 16:26:58 +02:00

sink_buffer.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

split.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

src_buffer.c

lavfi: remove vsrc_buffer.h API

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

src_movie.c

lavfi/movie: force channel layout if not set by the decoder

2012-07-31 13:25:14 +02:00

transform.c

libavfilter/transform: fix mirroring.

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

transform.h

…

version.h

lavfi: move color filter to testsrc, factorize

2012-08-03 16:26:58 +02:00

vf_alphaextract.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_alphamerge.c

vf_alphamerge: Fix reversed conditional

2012-07-27 14:00:04 +02:00

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_ass.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_bbox.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_blackdetect.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_blackframe.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_colormatrix.c

vf_colormatrix: add missing semicolon

2012-07-23 19:58:13 +00:00

vf_copy.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

vf_crop.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_cropdetect.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_delogo.c

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vf_deshake.c

vf_deshake: set cur_buf to NULL.

2012-07-23 22:44:25 +02:00

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_drawtext.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_fade.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_fieldorder.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_format.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

vf_fps.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_gradfun.c

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vf_hflip.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_hqdn3d.c

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vf_idet.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_libopencv.c

Fix misc swapped dot and carriage returns in av_log calls.

2012-08-03 14:58:14 +02:00

vf_lut.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_mp.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_null.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

vf_overlay.c

vf_overlay: ensure the overlay frame does not get leaked.

2012-07-26 00:01:04 +02:00

vf_pad.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_removelogo.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_scale.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_select.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_setfield.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_setpts.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_showinfo.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_slicify.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_super2xsai.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_swapuv.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_thumbnail.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_tile.c

vf_tile: fix output buffer ownership.

2012-08-01 12:23:48 +02:00

vf_tinterlace.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_transpose.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_vflip.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_yadif.c

yadif: update frame rate

2012-07-30 14:17:10 +02:00

video.c

lavfi: use a new field for automatic buffer copy.

2012-08-04 21:49:05 +02:00

video.h

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vsink_nullsink.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vsrc_cellauto.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

vsrc_life.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +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: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

vsrc_testsrc.c

lavfi: move color filter to testsrc, factorize

2012-08-03 16:26:58 +02:00

yadif.h

Merge remote-tracking branch 'qatar/master'

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