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

* commit 'c042cbc3':
  libx265: Use the repeat headers flag when not using global headers

See: 1b28d9b3Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cd606317':
  libx265: Bump version requirement

See: 32998ee9Merged-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>

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some
samples there is padding between the offset table and ADPCM data.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

QTKit can/should be disabled by "--disable-indev=qtkit".

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

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

* qatar/master:
  libmp3lame: add ABR support

Conflicts:
	libavcodec/libmp3lame.c
	libavcodec/version.h

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

* commit '292dbe5e':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
	libavcodec/libmp3lame.c

See: 07e7bc9cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '729d821f':
  libmp3lame: allow joint stereo to be disabled

Conflicts:
	libavcodec/libmp3lame.c
	libavcodec/version.h

See: 1de11a7cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '12789d96':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
	libavformat/isom.c

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

* commit 'fce28c3c':
  mov: fill in subtitle dimensions after parsing tkhd

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

* commit '96138e8c':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

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