* commit '76b19a39':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e8da8075':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
	cmdutils.c
	libavcodec/libschroedinger.c
	libavcodec/libschroedingerenc.c
	libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e951b6d9':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

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

* commit 'b58b00ae':
  configure: Separate "ln" command line arguments

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

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

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

this is needed for testing mmx2 functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avprobe and avserver use cmdutils and do not strictly require libavresample.

This is consistent with the rest of libavcodec.

This is consistent with the rest of libavcodec.

This is consistent with the rest of libavcodec.

Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Its unlikely this affects any valid files.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is more compatible and not more complicated.

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

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

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

* qatar/master:
  vorbisdec: Accept 0 amplitude_bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b47c19b':
  vorbisdec: Add missing checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc386f2e':
  vorbisdec: cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '11dcecfc':
  vorbisdec: Error on bark_map_size equal to 0.
  dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The specification does not prevent an encoder to write the amplitude 0
as 0 amplitude_bits.

Our get_bits() implementation might not support a zero sized read
properly, thus the additional branch.

Rate and order must not be 0 even if the specification does not say that
explicitly.

Use the commonly used "if (!var)" instead of "if (var == 0)".

The value is used to calculate output LSP curve and a division by zero
and out of array accesses would occur.

CVE-2013-0894

CC: libav-stable@libav.org
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

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

This is needed to prevent the next commit from breaking fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is very close to what the default does currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reflect the type of the corresponding field in lavc/lavfi.

Allow to select sample rates.

"channels" is an int in all the other places in the libraries, and the
av_frame_*_channels() accessors return and set an int, so this should not
implicate ABI breaks.