aac: check the maximum number of channels

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

CC:libav-stable@libav.org
avformat: Add black ops audio demuxer

Fixes Ticket2064

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'

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

Conflicts:
	libavformat/hlsenc.c
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

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

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'

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

Conflicts:
	libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'

* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
  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>
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'

* commit '28663511c99b3cdaf9387a15032259879474f5f4':
  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>
doc/filters: apply various general fixes to vidstabdetect docs

Adopt generally used conventions, extend and clarify explanations.
lavfi/transpose: apply grammar consistency fixes to transpose dir option
lavfi/mp: remove mp=tinterlace wrapper

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
Merge commit 'b963f021b603509b5159873de4919dec441d0782'

* commit 'b963f021b603509b5159873de4919dec441d0782':
  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>
Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'

* commit '1b6f84a98665a15130e969fd6b460a05d50090c1':
  h264_refs: Do not print check_opcodes() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: check the maximum number of channels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
sws: extend packed_16bpc_bswap code to handle planar formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: add 16bit gbrp formats to packed_16bpc_bswap()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: enable xyz12, this for now is just for swaping between le and be

Needed for fixing fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fate: fix jpeg2000 on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fate: temporary disable jpeg2000 test to avoid fate breakage from next commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: remove hack to support partial convert / xyz bswaping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: support xyz input

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