Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'

* commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

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

diff --cc libavformat/hevc.c
Simple merge

diff --cc libavformat/hevc.h
Simple merge

diff --cc libavformat/movenc.c
Simple merge