Merge remote-tracking branch 'qatar/master'

* qatar/master: (24 commits)
  yop: set channel layout
  wtv: set channel layout for mpeg audio
  westwood_aud: set channel layout
  wc3movie: set channel layout
  tmv: set channel layout
  tiertexseq: set channel layout
  swfdec: set channel layout
  sol: set channel layout
  smacker: set channel layout
  siff: set channel layout
  sierravmd: set channel layout
  rtpdec_amr: set channel layout
  rsodec: set channel layout
  rmdec: set channel layout for RA version 3
  qcp: set channel layout
  psxstr: set channel layout
  omadec: set channel layout
  oggparsespeex: validate channel count and set channel layout
  nuv: set channel layout
  mxg: set channel layout
  ...

Conflicts:
libavformat/swfdec.c
libavformat/wtv.c

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

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
  jvdec: set channel layout
  iss: set channel layout
  ipmovie: set channel layout
  iff: set channel layout
  idroqdec: set channel layout
  gxfdec: set channel layout when applicable
  gsmdec: set channel layout
  flvdec: set channel layout
  dv: set channel layout
  dsicin: set channel layout
  daud: set channel layout
  cdxl: set channel layout
  bmv: set channel layout
  bink: set channel layout
  bfi: set channel layout
  bethsoftvid: set channel layout
  apc: set channel layout
  amr: set channel_layout
  ppc: replace pointer casting with AV_COPY32
  ppc: fix some unused variable warnings
  ...

Conflicts:
libavformat/amr.c
libavformat/iff.c

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

remove tests/asynth1.sw

This file appears to have been commited by 100l mistake.

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

fate/avfilter: honor GPL dependency.

wavpack: check the blocks sample count, fix out of array accesses

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

wavpack: check ch_offset

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

flashv: check if keyframe is available, fix null deref.

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

flashv: use avcodec_set_dimensions()

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

svq1dec: dont export the qscale table.

SVQ1 has no qscales so the table is of no use, and it triggers a bug as
SVQ1 does not maintain the size of the table properly causing a crash.

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

indeo4: more complete check for the scan vs block sizes.

Fixes out of array reads

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

lavc/aac: fix shared build failures with MSVC.

This is a workaround until a better solution is found.

xan: check size_segment before reading, fixes out of array read.

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

mjpegdec: tighten unescaped_buf_size size check, prevent null ptr deref

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

swfdec: check space before copy

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

theora: check that pix fmt is valid, fix null ptr deref

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

lagarith: always allocate for 4 planes. Fixes out of array accesses

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

wv: use right function to read block_samples

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

yop: set channel layout

wtv: set channel layout for mpeg audio

westwood_aud: set channel layout

wc3movie: set channel layout

tmv: set channel layout

tiertexseq: set channel layout

swfdec: set channel layout

sol: set channel layout

smacker: set channel layout

siff: set channel layout

sierravmd: set channel layout

rtpdec_amr: set channel layout

rsodec: set channel layout

rmdec: set channel layout for RA version 3

qcp: set channel layout

psxstr: set channel layout

omadec: set channel layout

jvdec: set channel layout

oggparsespeex: validate channel count and set channel layout

iss: set channel layout

nuv: set channel layout

mxg: set channel layout

mvi: set channel layout

mpc7: set channel layout

mmf: set channel layout

mm: set channel layout

ipmovie: set channel layout

iff: set channel layout

idroqdec: set channel layout

gxfdec: set channel layout when applicable

gsmdec: set channel layout

flvdec: set channel layout

dv: set channel layout

dsicin: set channel layout

daud: set channel layout

Update FATE reference due to WAVE channel mask now being set correctly.

cdxl: set channel layout

bmv: set channel layout

bink: set channel layout

bfi: set channel layout

bethsoftvid: set channel layout

apc: set channel layout

amr: set channel_layout

4xmdec: test version for cfrms, fix out of array accesses

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

wavpack: fix out of array access

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

adpcm: reindent after previous commit

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

adpcm: ADPCM IMA SMJPEG stereo decoding

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

anm: return meaningful error codes

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  binkaudio: set channel layout

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

Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'

These patches have not been merged at the request of Carl

* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
  build: Drop AVX assembly ifdefs
  x86: Require an assembler able to cope with AVX instructions

Conflicts:
libavcodec/x86/fft.asm

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

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h

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

ppc: replace pointer casting with AV_COPY32

This removes warnings about strict aliasing violations.

Signed-off-by: Mans Rullgard <mans@mansr.com>

ppc: fix some unused variable warnings

The third argument of OP_U8_ALTIVEC is evaluated at most once so
there is no need for a potentially unused temporary variable.

Signed-off-by: Mans Rullgard <mans@mansr.com>

configure: remove support for -n flag in print_enabled()

This flag is no longer used.

Signed-off-by: Mans Rullgard <mans@mansr.com>

Merge commit '802713c4e7b41bc2deed754d78649945c3442063'

* commit '802713c4e7b41bc2deed754d78649945c3442063':
  mss2: prevent potential uninitialized reads
  mss2: reindent after last commit
  mss2: fix handling of unmasked implicit WMV9 rectangles
  configure: add lavu dependency to lavr/lavfi .pc files
  x86inc: Set program_name outside of x86inc.asm

Conflicts:
configure

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

binkaudio: set channel layout

vc1dec: prevent null ptr dereferences.

The added checks are in line with existing checks but should
probably be replaced by more advanced error concealment at some
point.

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

vc1dec: factorize srcU/V offseting out

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

vc1: check image height, fix division by 0

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

mpeg12: clean current picture ptr.

This avoids having a stray pointer left that may not represent the current picture
and state.

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

lavfi: remove mp=geq filter.

Native geq video filter is now available.

lavfi: add geq filter.

lavf/assenc: add non strict ts flag.

ASS can have several events at the same time.

lavfi: remove mp=fixpts filter.

lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.

lavfi: remove mp=tile filter.

The native tile video filter is now feature equivalent.

fate/lavfi: increase vf tile coverage.

doc/filters: complete tile documentation.

lavfi/tile: extend shorthand parameters.

This makes the syntax similar to mp=tile.

lavfi/tile: add nb_frames option.

lavfi/tile: add margin and padding options.

lavfi/tile: allow named arguments.

gxf: avoid null ptr deref without streams.

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

proresdec: check input size before reading qmats, prevent overreading.

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

build: Drop AVX assembly ifdefs

An assembler able to cope with AVX instructions is now required.

doc: git-howto: Leave reviewers time to react before pushing patches

x86: Require an assembler able to cope with AVX instructions

All modern assemblers have this capability.  Older NASM versions
that lack the capability produce code that crashes at runtime,
so it's better to error out during the build process instead.

CC: libav-stable@libav.org

dsicinav: update bitmap_frame_size, avoid out of array reads.

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

Include libavutil/channel_layout.h instead of libavutil/audioconvert.h

Also reorder some other #include when applicable.

lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

snow: fix edge emu switch

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

msmpeg4dec: check w/h, prevent assert failure later

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

segafilm: fix division by 0

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

omadec: fix len check in nprobe() prevent out of array access

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

zmbvdec: check decompression buffer size.

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