* commit 'c82bf15d':
  rtpenc: Merge the h264 and hevc packetizers

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