* commit '15fa856b':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9580818c':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

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

* commit '01947f07':
  avconv: remove a useless line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '65ed9e75':
  avconv: rename 'codec' to 'enc_ctx'

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

* commit '650a5206':
  avconv: rename 'icodec' to 'dec_ctx'

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

* commit 'f3a6ad22':
  avconv: rename InputStream.opts to InputStream.decoder_opts

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

* commit '73ed8558':
  avconv: simplify exit_program() by using more local vars

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

7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>

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

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

* cehoyos/master:
  Map --enable-lto to -ipo when compiling with icc.
  Disable inline_asm_direct_symbol_refs if lto was requested.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This fixes link time optimizations with gcc without disabling inline asm.

Fixes ticket #2941.

This is continuation of commit 330d547e
Nested struct is set in two places.
Previous commit set nested struct only in one case.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
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>

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

Fixes Ticket #2847.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* cehoyos/master:
  Initialize riff and wav size fields to -1 instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dcbfb780':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
	libavformat/utils.c

See: 7bdc5de3Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f66d0c57':
  latm: Add a probe function

Conflicts:
	libavformat/rawdec.c

See: 47818b2a
See: 097f6680Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'de69aedf':
  mathematics: K&R formatting cosmetics

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

* commit '3a177a9c':
  swscale: Fix an undefined behaviour
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '925c3787':
  vp9: Read the frame size as unsigned

Conflicts:
	libavcodec/vp9.c

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

* commit 'a90d92ce':
  aac: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c6b42e85':
  flv: K&R formatting cosmetics

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

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

This fixes pointer type warnings
The context should have been unused so this should not fix any real bug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

WMP doess not play the output files if the fields are
set to 0 and not overwritten (using pipe output).

Fixes ticket #3346.

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