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

* commit '9bd4a9f4':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

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

* commit '3e4e2142':
  fate: Convert the paletted output in the brenderpix tests to rgb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This also moves mov_rewrite_dvd_sub_extradata() to mov.c.

Sample-Id: NeroRecodeSample.mp4

Sample-Id: NeroRecodeSample.mp4

Sample-Id: NeroRecodeSample.mp4

This avoids the 2nd buffer and fixes the palette truncated check

This makes the output consistent on big-endian systems.

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

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

* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
	doc/ffmpeg.texi

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

* commit '68e95ab8':
  dnxhdenc: return meaningful return codes

Conflicts:
	libavcodec/dnxhdenc.c

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

* commit '9e4e35b4':
  avconv_opt: fix avio_open2() return code check

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

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These charts in man page are currently destroyed.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Fixes ticket #3473.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should have no effect currently as there are no such options yet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>