* 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>

The function is documented in mem.h.

In particular, deprecate numerical values for the dir option.

They were lost in commit a4e0defa.

The return value provides no useful information and removing the printing
avoids the following warning:
libavcodec/h264_refs.c:788:15: warning: 'i' may be used uninitialized in this function [-Wuninitialized]

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

CODEC_CAP_FRAME_THREADS is not added yet because that would
unconditionally enable it, breaking gop>1 files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents

Conflicts:
	tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Set the data field in the flush_pkt to the pointer to the actual packet.
The field needs to contain a valid unique pointer, no read nor writes
are ever made to it.

CC:libav-stable@libav.org

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

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

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

printing "hq" depending on a single video encoding parameter makes
little sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This also decreases dependancies between intrax8 and the outside
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.

The function requires increasing the fuzz factor for the ac3/eac3 encode
tests and even so makes fate fail. It only provides a slight encoding
speedup for legacy CPUs that do not support SS2. Thus its benefit is not
worth the trouble it creates and fixing it would be a waste of time.