* commit '93632a70':
  doc: Name the MOV muxer as it should be called

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

* commit 'a7b3216c':
  doc: Sort the muxer documentation

Conflicts:
	doc/muxers.texi

No change as ours was already sorted
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '874c751c':
  threads: Check w32threads dependencies at the configure stage
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This also fixes a null pointer dereference with rgb and plane prediction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes make checkheaders without decklink headers.

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

avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate has a comparably unlikely value

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

Fixes compilation with --disable-everything --enable-filter=dctdnoiz

The section name is the muxer, not the format.

Keep the sections alphabetically sorted.

* qatar/master:
  vf_interlace: deprecate lowpass option

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

* commit 'b23bc959':
  x86: dca: Add missing multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.

* commit '294a51e1':
  gitignore: Add all examples below doc/examples
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '1e142d5b':
  movenc: Add a fallback fragmentation method for plain mp4 as well

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

* commit '543156d7':
  arm: Mark the stack as non-executable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes division by 0
Fixes: 3c980274cecaca6ca5d6e517c0c1983e-signal_sigabrt_7ffff7125425_410_cov_3621042467_2_audio_streams.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Previously the default fragmentation method was only enabled
if writing an ISM file.
Signed-off-by: Martin Storsjö <martin@martin.st>

If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

* qatar/master:
  h264: informative error reporting in decode_slice_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '96f9fbe1':
  h264: fix slice_type value reported in decode_slice_header()

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

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

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

This avoids going over a double precission float, which may loose precission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

EXR files have, like tiffs, multiple channels and layers.  I have a
patch for exr.c that allows you to select the layer you want to process
thru a -layer flag.  It is not bulletproof but works for all layers that
have 3 channels in them (normals, motion vectors, etc).
The calling convention for ffmpeg is:

ffmpeg -layer Diffuse -i myexr.%d.exr test.mov

Here's an exr image with multiple layers:

http://www.datafilehost.com/d/e45d9a1cReviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  Fix libswresample compilation with Apple Neon assembler.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d7ab5cf':
  doxygen: Add a number of missing function parameter descriptions

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