* commit 'a1e05b04':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b4729382':
  lavfi: add an asetpts filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/f_setpts.c
	libavfilter/setpts.c
	libavfilter/version.h
	libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2548834b':
  vf_setpts: cosmetics, reformat

Conflicts:
	libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c22263d3':
  graphparser: only print filter arguments if they are non-NULL
  af_channelmap: ensure the output channel layout is valid.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '949c603e':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

Conflicts:
	libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e036bb78':
  lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
  FATE: add an additional indeo3 test
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bda9e6d9':
  indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

Conflicts:
	libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '95220be1':
  indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...

hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).

This fixes returning pictures with corrupted data pointers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes calling a random pointer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This should be reverted once palettes are dealt with in a endian independant way
in packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.

It now allows an arbitrary number of inputs, not just two.

Otherwise some code might mistakenly think it is allowed to unref those
buffers, which would lead to double unref.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

They are the same in this case, except put_pixels also has blocksizes
smaller than 8.

CC:libav-stable@libav.org

It is a part of the sample that got broken by recent indeo3 changes.

* qatar/master:
  x86: dsputil: Remove a set of pointless #ifs around function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '85f2f82a':
  x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge of b963f021 is now complete.

This patch is the same as 52b23cbf.