* qatar/master:
  x86: lpc: fix a segfault in av_evaluate_lls_sse2()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes regression and Ticket2720
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #2735.

Fixes ticket #2732.

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

* cehoyos/master:
  Support compilation on aix with gcc.
  Rename "AVClass class" as "AVClass component_class".
  Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
  Rename thread_init() in libavcodec and libavfilter as library_thread_init().
  Rename constant HZ in af_biquads.c as HERTZ.
  Drop local lable from ppc asm timer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It just segfaults on 32bit, thus its disabled until someone fixes it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@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>

* 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>

Shared libraries and the IBM compiler are currently not supported.
"--arch=ppc" has to be passed to configure, uname is not compatible.

The aix header math.h defines "extern int class()" for C.

The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.

The aix header sys/thread.h contains a definition for thread_init().

The aix header sys/m_param.h defines HZ as _HZ.

The aix assembler does not support local lables.

* 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>