* commit '5c79d2e1':
  avconv: Do not divide by zero

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

* commit 'd6a27f88':
  configure: Add usan to the toolchain presets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2b0bb699':
  configure: Move cpunop into ARCH_EXT_LIST_X86

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

* commit '6adf4290':
  configure: Move inet_aton check into network function check block
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9c029f67':
  aarch64: use EXTERN_ASM consistently for exported symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '996697e2':
  x86: float dsp: unroll SSE versions

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

* commit 'ef010f08':
  dca: replace some memcpy by AV_COPY128

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

* commit '982b596e':
  h264: avoid undefined behavior in chroma motion compensation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

clang-3.4 and gcc-4.9 have it.

It is a processor feature, so it belongs there.

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

* cigaes/master:
  ffmpeg: make reading packets from thread blocking.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mpeg4video_parser: Drop pointless av_-prefix from static function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '984e3398':
  avcodec: Consistently name encoder init functions foo_encode_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Based on e3fec3f0 for arm.

* commit '017a06a9':
  x86: dsputil: Use correct file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ba42c852':
  bit_depth_template: Use file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '61e7c7f2':
  svq3: Adjust #endif comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '192ccc50':
  build: The MPEG-4 video parser depends on h263dsp

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

vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.

Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

Makes fate-h264 pass under valgrind --undef-value-errors=yes with
-cpuflags none. {avg,put}_h264_chroma_mc8_8 approximately 5% faster,
{avg,put}_h264_chroma_mc4_8 2% faster both on x86 and arm.

The dependency is indirect through the h263/mpegvideo code.
CC: libav-stable@libav.org

If a packet is not ready on the input selected by ffmpeg,
it will read from another input instead. If that happens
repeatedly, frames will accumulate somewhere later in the
processing to ensure streams synchronization. It can happen
in particular when reading from a slow medium or an
expensive lavfi filter graph.

Make reading from normal demuxers on non-streamed data and
from the lavfi pseudo-device blocking to avoid that.

Should fix trac ticket #3079.

Fixes out of array read
Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cigaes/master:
  lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket3329
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  libavformat/mpegts: expose raw packet size

Conflicts:
	libavformat/mpegts.c

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

* commit 'c3ecd968':
  AVOptions: add flags for read/read-only options

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6bb8720f':
  AVOptions: deprecate unused AV_OPT_FLAG_METADATA

Conflicts:
	doc/APIchanges
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  hevc: Always consider VLC NALU type mismatch fatal
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '175e5063':
  hevc: Mention the missing SPS in the error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>