* qatar/master:
  compat: wrap math.h to avoid AIX-specific clashes

Conflicts:
	configure

See: bf18abb2, 0915b531Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0420c810':
  log: pass the correct parameters to missing_feature_sample

Conflicts:
	libavutil/log.c

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

Suggested-By: Oliver Fromme <oliver@fromme.com>

* commit '6a10142f':
  indeo: reject negative array indexes

Conflicts:
	libavcodec/ivi_common.c

See: 93927eb3, a93c7ca6Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

AIX defines a class() function in its math.h header without any
guard.

CC:libav-stable@libav.org

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>

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

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.