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

* qatar/master:
  x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This makes the code faster.

This was supposed to be removed in 565e4993, but it was delayed due to
the port of the remaining filters. These buffer ref pointers are not
used anymore, thus dropped.

Fixes CID966647

The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This might fix fate failures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

CC:libav-stable@libav.org

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

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some old gnu assemblers fail to assemble qdadd correctly
Ideally we should check this at build time, but better to
check at run time than mysteriously failing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Stefano Sabatini

+10l.

* qatar/master:
  swscale: fix NULL checking in sws_alloc_context()
  mxfdec: fix NULL checking in mxf_get_sorted_table_segments()
  finalize changelog for version 9

Conflicts:
	Changelog
	libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b14e89b3':
  Prepare for 9 Release.
  Update release notes for the 9 release.
  avprobe: also output dar/par if only defined in stream

Conflicts:
	RELEASE
	avprobe.c
	doc/RELEASE_NOTES
Merged-by: Michael Niedermayer <michaelni@gmx.at>

If width is not alligned with hsub, background component should only be
multiplied once by sub alpha component.

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

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

Read channel source instead of channel target for channel sorting.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

This is a port of virtual dub's histogram equalization filter by Donald
A. Graft. Based on the work by Jérémy Tran <tran.jeremy.av@gmail.com>,
done for SOCIS 2012.

This is a port of the kerndeint filter (libmpcodecs/vf_kerndeint) by
Donal A. Graft (original avisynth plugin author), and is based on the
work by Jérémy Tran <tran.jeremy.av@gmail.com> done for SOCIS 2012.

Force commands to specify the name of the test to run. This simplifies
extending the function with a new parameter, which will be done in a
following patch.

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

sws_getCachedContext() and sws_getContext() expect sws_alloc_context()
to return NULL when out of memory, as follows.

    if (!(context = sws_alloc_context()))
        return NULL;

This patch fixes sws_alloc_context() to return NULL in that case.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

The following out-of-memory check is broken.

    *sorted_segments  = av_mallocz(...);
    if (!sorted_segments) { ... }

The correct NULL check should use *sorted_segments.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This code cannot use av_assert* due to circular header dependancies
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>