* commit '6d56bc9a':
  lavf: simplify ff_hevc_annexb2mp4_buf

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