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

* qatar/master:
  mjpeg: Check the unescaped size for overflows

Conflicts:
	libavcodec/mjpegdec.c

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

* commit '7520d977':
  mjpeg: Move code out of else branch

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

* commit '7798a59d':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '02ec656a':
  wmapro: error out on impossible scale factor offsets

The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4a217a4':
  wmapro: check the min_samples_per_subframe

Conflicts:
	libavcodec/wmaprodec.c

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

* commit '183880cf':
  pictor: use the correct logging context

No change, as this has already been fixed
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c93ccf5a':
  lpc: use levinson for the first pass of multipass cholesky

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

* commit 'b545179f':
  x86: lpc: simd av_evaluate_lls

Conflicts:
	libavutil/x86/lls.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The code doesnt build with yasm from ubuntu 12.04
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '502ab21a':
  x86: lpc: simd av_update_lls

The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
 commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41578f70':
  lpc: use function pointers, in preparation for asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cc6714bb':
  lpc: remove "decay" argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>

And contextually check init_get_bits success and fix the reporting
message.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Simplify the control flow and spare some vertical space.

similar is already done in the other get_bits() functions
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 undefined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The header is private, and ffmpeg.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

The header is private, and avconv.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

* cehoyos/master:
  Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Must be at least WMAPRO_BLOCK_MIN_SIZE.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Broken in 6d97484d

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

Fixes ticket #2728.

Fixes ticket #2723.

Levinson is faster, and cholesky is only needed if we want to apply different
weights to different samples, which doesn't happen on the first pass.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

1.5x-1.8x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

4x-6x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>