* commit '6dfacd7a':
  indeo: Cosmetic formatting
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '62256010':
  indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks

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

* commit 'f6f36ca8':
  indeo: Refactor ff_ivi_dec_huff_desc

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

* commit 'e6d8acf6':
  indeo: use a typedef for the mc function pointer
  cabac: x86 version of get_cabac_bypass
  aic: use chroma scan tables while decoding luma component in progressive mode

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

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

Prefer "non-negative" over "positive", the former is more accurate.

This should workaround issues with these functions on ia64 and sparc64

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

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

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

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

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

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

Fixes a crash when the codec stream is not supported by the rtp muxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Data is appended in fill_buffer() when there is sufficient space left
and the data pointer only reset when needed.
Previously the data pointer was more often reset, loosing more seekback
space than otherwise needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The aix header math.h defines "extern int class()" for C.
This fixes compilation on aix with external libraries enabled.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

see also http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-17#section-9.5Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Trim some overly long lines.

Spin large and mostly self contained blocks into stand alone
functions.

Spare an indentation level.

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

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>

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

For some unclear reason Apple decided to use the same scan tables for luma and
chroma in the progressive mode while using different ones for luma in the
interlaced mode.

Restores carefully the old behaviour
(and does not break decoding avi samples).
Fixes Ticket2536
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

When operating on subsampled chroma planes, some rounding is taking
place. The left and top borders are rounded down while the width and
height are rounded up, so all rounding is done outward to guarantee the
logo area is fully covered.

The problem is that the width and height are counted from the
unrounded left and top borders, respectively. So if the left or top
border position has indeed been rounded down, and the width or height
needs no rounding (up), the position of the the right or bottom border
will be effectively rounded down, i.e. inward.

The issue can easily be seen with a yuv240p input and
  -vf delogo=45:45:60:40:show=1 -vframes 1 delogo-bug.png
(or virtually any logo area with odd x and y and even width and
height.) The right and bottom chroma borders (in green) are clearly
off.

In order to fix this, the width and height must be adjusted to include
the bits lost in the rounding of the left and top border positions,
respectively, prior to being themselves rounded up.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

When interpolating, weights are based on relative distances, which
assume square pixels. If a non-1:1 sample aspect ratio is used, it
should be taken into account when comparing distances, because the
human eye and brain care about the picture as it is displayed, not
stored.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fix metadata display under iTunes for files using pgap, hdvd, stick,
tvsn and tves tags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  jpeg2000: Use the matching coding style struct for transform selection
  jpeg2000: Merge rescaling with interleaving in 9/7 IDWT

No change, all commits & hunks where already in.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '22e18ea3':
  jpeg2000: Optimize output sample conversion
  jpeg2000: Reset s->numX/Ytiles on tile deallocation
  jpeg2000: Optimize dequantization
  jpeg2000: Do not assume a single tile
  jpeg2000: Speed up jpeg2000_decode_tile()
  jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()

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