* commit '85dc006b':
  lavc: fix bitshifts amount bigger than the type

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

* commit '771656bd':
  libvpxenc: clean memory on error

Conflicts:
	libavcodec/libvpxenc.c

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

* commit 'a28468d0':
  librtmp: append the correct field to the string

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

* commit '9257692a':
  lavf: Only initialize s->offset once when using avoid_negative_ts make_zero

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

CC: libav-stable@libav.org
Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638

CC: libav-stable@libav.org
Bug-Id: CID 733795

Also prevent a NULL pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1250329 / CID 1250331

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

* commit 'c302d034':
  tools: Add a sidxindex tool

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

* commit '40ed1cbf':
  movenc: Allow writing a DASH sidx atom at the start of files

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

* commit '3847f3ab':
  movenc: Add tfra entries for all tracks in a moof
Merged-by: Michael Niedermayer <michaelni@gmx.at>

When given a stream starting at dts=0, it would previously consider
s->offset as uninitialized and set an offset when the second packet
was written, ending up writing two packets with dts=0. By initializing
this field to AV_NOPTS_VALUE, we make sure that we only initialize it
once, on the first packet.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'fe5e6e34':
  lavf: Add an MPEG-DASH ISOFF segmenting muxer

Conflicts:
	Changelog
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ded5737':
  movenc: Add support for writing sidx atoms for DASH segments

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

* commit '2d9d6afb':
  movenc: Factorize adding fragment info into a separate function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0f9eb916':
  movenc: Include empty tracks in iods when writing fragmented mp4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #4107.

This tool can write an MPD file for fragmented MP4 files with
a sidx index at the start of the file.
Signed-off-by: Martin Storsjö <martin@martin.st>

This is mapped to the faststart flag (which in this case
perhaps should be called "shift and write index at the
start of the file"), which for fragmented files will
write a sidx index at the start.

When segmenting DASH into files, there's usually one sidx
at the start of each segment (although it's not clear to me
whether that actually is necessary). When storing all of it
in one file, the MPD doesn't necessarily need to describe
the individual segments, but the offsets of the fragments can be
fetched from one large sidx atom at the start of the file. This
allows creating files for the DASH ISO BMFF on-demand profile.
Signed-off-by: Martin Storsjö <martin@martin.st>

Previously only tfra entries were added for the first track in each moof.

The frag_info array used for tfra can also be used for writing
other kinds of fragment indexes, where it's more important to
include all tracks.

When the separate_moof option is enabled (as in ismv), we write
a separate moof for each track, so this doesn't make any difference
in that case.
Signed-off-by: Martin Storsjö <martin@martin.st>

This is mostly to serve as a reference example on how to segment
the output from the mp4 muxer, capable of writing the segment
list in four different ways:
- SegmentTemplate with SegmentTimeline
- SegmentTemplate with implicit segments
- SegmentList with individual files
- SegmentList with one single file per track, and byte ranges

The muxer is able to serve live content (with optional windowing)
or create a static segmented MPD.

In advanced cases, users will probably want to do the segmenting
in their own application code.
Signed-off-by: Martin Storsjö <martin@martin.st>

A flag "dash" is added, which enables the necessary flags for
creating DASH compatible fragments.

When this is enabled, one sidx atom is written for each track
before every moof atom.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Enabled compilation with compiler without inline asm support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

By calling this after writing the moof the first time (for
calculating the moof size), we can avoid intermediate storage
of tfrf_offset in MOVTrack.
Signed-off-by: Martin Storsjö <martin@martin.st>

When writing fragmented streams with an empty initial moov,
we won't have any samples in any tracks when writing the
moov atom, thus trust that any tracks that are added actually
will be present.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

* commit 'c64f3615':
  flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d0cd5f5':
  flvenc: move metadata updates into a single function

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

* commit '8b573ddd':
  hevc: remove superfluous assignments and checks

Conflicts:
	libavcodec/hevc.c

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

* commit 'eac3ac1f':
  hevc: eliminate an unneeded intermediate variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'eb335f3c':
  hevc: reduce variable scope

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

* commit '84c0ece5':
  hevc: further reduce code duplication in hls_prediction_unit()

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

* commit 'a7b365ae':
  hevc: reduce code duplication in hls_prediction_unit()

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

* commit 'de1f8ead':
  hevcdsp_template: templatize transquant_bypass

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

* commit '16c01fb4':
  hevc: remove an unused function parameter

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

* commit '84b94639':
  hevc: remove a redundant line

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

* commit '2c6a7f93':
  hevc: do not store rqt_root_cbf in the context

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

* commit '920bca3e':
  hevc: do not store pcm_flag in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>