* qatar/master:
  x86: hpeldsp: Remove unused macro definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also make life test a bit more useful.

It was considered a comment.

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

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

The standalone alphaextract tests are removed since already the filters
are already tested by the alphamerge tests.

* cehoyos/master:
  Recognize j2k as file suffix for the image2 muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes green bottom line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should fix gif fate memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Hanspeter Niederstrasser <niederstrasser@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

The implementation is heavily based on Matthias Buerchers and Nicolas Bertrands vf_xyz2rgb.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Needed for fixing fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  aac: check the maximum number of channels
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1b6f84a9':
  h264_refs: Do not print check_opcodes() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b963f021':
  fate: Invoke pixfmts lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>

From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.

See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200

Adopt generally used conventions, extend and clarify explanations.

* commit '28663511':
  fate: Invoke pixdesc lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh
	tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '03b052c0':
  fate: Invoke standard lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c1401054':
  oma: K&R formatting cosmetics

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

* commit '26a44143':
  avplay: remove a warning

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

* commit 'cf679b94':
  hls, segment: fix splitting for audio-only streams.

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

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

Broken bitstreams could report a larger than specified number of
channels and cause outbound writes.

CC:libav-stable@libav.org

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