the CONFIG_ prefix is used by configure, using it for other things
is potentially confusing to the reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

should fix fate failures on darwin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fate: add SGI tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd613091f':
  sgi: decode 16bit RLE images

Conflicts:
	Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6c1df1f2':
  sgi: encode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog
	libavcodec/sgienc.c

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

* commit 'f8dea10d':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog

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

* commit 'ab7c6462':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
	libavcodec/sgidec.c

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

* commit '6d9ccee4':
  sgi: set the row boundary to the correct value

Conflicts:
	libavcodec/sgidec.c

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

* commit '0279d1d0':
  sgi: fix end of line boundary detection

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

* commit 'e7cd53bf':
  sgi: check maximum supported resolution

Conflicts:
	libavcodec/sgienc.c

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

* commit 'a7dbfcf6':
  sgi: K&R formatting cosmetics

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

* commit 'ca36aa9e':
  codec_desc: set lossless attribute for SGI and DPX

Conflicts:
	libavcodec/codec_desc.c

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

* commit '06688e96':
  fate: add exr tests

Conflicts:
	tests/fate/image.mak

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

* commit '38389058':
  OpenEXR decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/exr.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '678e455f':
  dxva2: Directly use AVFrames

Conflicts:
	libavcodec/dxva2_h264.c

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

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

The assumption of (MPEG) Picture and H264Picture layout matching might
not hold true in the future.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>

Fixes use of uninitialized memory
Fixes valgrind failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  mov: Unbreak sbtl writing

Conflicts:
	libavformat/movenc.c

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

* commit '654c7446':
  vc1dec: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '33259118':
  h263: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>