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>

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

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

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

Fixes null pointer dereference
Fixes CID1251347
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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