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

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

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>

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

We cannot easily determine if an mpeg TS's packet size is DVHS, FEC
or so on, for that we need to expose the internal raw_packet_size
field.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

It was never used since it was added and the things it was intended for
are now exported differently.

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

Sample-Id: 00001667-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

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>

Fix trac ticket #3380.