* commit '7388c0c5':
  indeo: Properly forward the error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The original delogo algorithm interpolates both horizontally and
vertically and uses the average to compute the resulting sample. This
works reasonably well when the logo area is almost square. However
when the logo area is significantly larger than high or higher than
large, the result is largely suboptimal.

The issue can be clearly seen by testing the delogo filter with a fake
logo area that is 200 pixels large and 2 pixels high. Vertical
interpolation gives a very good result in that case, horizontal
interpolation gives a very bad result, and the overall result is poor,
because both are given the same weight.

Even when the logo is roughly square, the current algorithm gives poor
results on the borders of the logo area, because it always gives
horizontal and vertical interpolations an equal weight, and this is
suboptimal on borders. For example, in the middle of the left hand
side border of the logo, you want to trust the left known point much
more than the right known point (which the current algorithm already
does) but also much more than the top and bottom known points (which
the current algorithm doesn't do.)

By properly weighting each known point when computing the value of
each interpolated pixel, the visual result is much better, especially
on borders and/or for high or large logo areas.

The algorithm I implemented guarantees that the weight of each of the
4 known points directly depends on its distance to the interpolated
point. It is largely inspired from the original algorithm, the key
difference being that it computes the relative weights globally
instead of separating the vertical and horizontal interpolations and
combining them afterward.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

If the tile data size does not match the buffer size it did not
return an AVERROR_INVALIDDATA causing futher corruption later.

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

This could happen if oom occured while probing a file.
Fixes ticket #2722.

* cus/stable:
  ffplay: always send zero packets to flush audio decoders
  ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 24742524.

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

Zero packets are needed not for codecs with CODEC_CAP_DELAY but for
multithreaded decoders as well.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes ticket #2717.
Signed-off-by: Marton Balint <cus@passwd.hu>

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>