* commit 'cf589faa':
  movenc: Add a flag for using default-base-is-moof in tfhd atoms

Conflicts:
	libavformat/version.h
Merged-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 leaves some av_free() where the pointer is overwritten
shortly later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes undefined behavior
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array access
Fixes: asan_stack-oob_49b1e5_10_009.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This allows validation of ffprobe XML output if -show_packets and
-show_frames are both set.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Old versions of libxcb do not provide xcb_shape_rectangles().
The issue can be fixed differently but this small change fixes
some fate platforms and a user reported compilation problem.

Reported and tested by trac user kevmitch.
Fixes ticket #4067.

* commit '600d5ee6':
  movenc: Signal iso6 in compatible_brands when using tfdt
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9911a1b':
  doc: Document the omit_tfhd_offset flag to the mp4 muxer

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

* commit '1e0b81ab':
  movenc: Use a local variable consistently
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b2b79eca':
  movenc: Don't check the custom IO flag when using faststart
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '573b1de2':
  movenc: Don't use track_id to decide which track is the first in a moof
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array access
Fixes: asan_heap-oob_12a55d3_30_029.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes an "initialization discards qualifiers from pointer target type" warning.

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

* commit '84bf64d3':
  bethsoftvid: simplify return handling

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

* commit 'e9ba3098':
  assdec: check av_new_packet return value

Conflicts:
	libavformat/assdec.c

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

Similarly to the omit_tfhd_offset flag added in e7bf085b, this
avoids writing absolute byte positions to the file, making them
more easily streamable.

This is a new feature from 14496-12:2012, so application support
isn't necessarily too widespread yet (support for it in libav was
added in 20f95f21 in July 2014).
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

The custom IO flag actually never is set for muxers, only for
demuxers, so the check was pointless (unless a user intentionally
would set the flag to signal using custom IO).
Signed-off-by: Martin Storsjö <martin@martin.st>

If one track doesn't have any samples within a moof, no traf/trun
is written for it. When the omit_tfhd_offset flag is set, none
of the tfhd atoms have any base_data_offset set, and the implicit
offset (end of previous track fragment data, or start of the moof
for the first trun) is used.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '2cd28693':
  jack: Use av_strerror
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Should fix printing the wrong value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '043ea6f7':
  fbdev: Use av_strerror

Conflicts:
	libavdevice/fbdev_dec.c

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

* commit 'f64d7e91':
  mtv: improve header check and avoid division by zero

Conflicts:
	libavformat/mtv.c

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

* commit 'b3d11437':
  oggenc: remove unneeded null check

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

* commit 'a9179b5b':
  configure: Check only for xcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>

add support for AVC Intra 50 720p and 1080p without SPS/PPS header in mxf and mov demuxers. I got the SPS/PPS tables from libbmx.

Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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