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

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>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Also, collapse the array into a scalar, since only one value is needed
at a time.

pred_mode is overwritten a few lines immediately below.

It does not need to be accessed outside of hls_coding_unit().

It does not need to be accessed outside of hls_coding_unit().

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

Avoids printing confusing and unrelated errors
Fixes Ticket2772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID #1254662
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Preset are translated to AVOptions.
It is not required to reparse anymore.

Fixes CID #1254667
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>