* commit 'dca7ba4b':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

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

This is no longer needed since the version bump.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

The files are only ever compiled if that condition is true.

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

It obvously needs to be above the include statement.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '48e50921':
  avconv: make -shortest work with streamcopy

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

Resolution can be 1920x1080 or 960x540.

CC: libav-stable@libav.org

Fixes track ticket 3717.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2f417031':
  libx264: Support bitrate reconfiguration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

They used an extra, undeclared register. Fixes a crash in
fate-vsynth3-ffvhuff444p16
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cd62c04d':
  h263enc: keep block_last_index always valid during advanced intra coding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '0ddc53da':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
	libavcodec/mpegvideo.c

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

Sometimes the input buffers get directly used as raw images and
SIMD optimized video/image filters can sometimes read more than 16 bytes
over the end.
a specific example is the AVX 24bpp to yuv code

This also fixes fate-vsynth3-rgb
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes valgrind mpeg4 failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lou Logan <lou@lrcd.com>

Prevents a triggered assert during fate-vsynth{1,2}-rv20 in
dct_unquantize_h263_intra_c().

Since error resilience uses AVFrame pointers instead of references it
has to copy NULL pointers too. After a codec flush the last/next frame
pointers in MpegEncContext are NULL and the old pointers remaining in
ERContext are invalid. Fixes a crash in vlc for android thumbnailer.
Reported and debugged by Adrien Maglo <magsoft@videolan.org>.

Signed-off-by: Mark Heath <silicontrip@gmail.com>
Signed-off-by: Dave Rice <dave@dericed.com>
Signed-off-by: Clément Bœsch <u@pkh.me>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

grayscale is coded as 4 pixels at a time, the encoder lacks support
for the case where width%4 != 0, and will simply encode less data
leaving random data after decoding at the right side
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The encoder lacks support for width % 4 != 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '641e5723':
  fate: add on2avc audio test

Conflicts:
	tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd7705be9':
  mpegvideoenc: check color_range

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

* commit '27860819':
  ppc: Consistently use convenience macro for runtime CPU detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '205fdd4e':
  ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Rework the comparison into something simpler to understand.

* commit 'f121dbd9':
  mpegts: Provide an option to override the pcr period

Conflicts:
	doc/muxers.texi
	libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3f7e94ec':
  mpegts: Move the option section to the bottom

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