* commit 'e36a2f4c':
  hevc: eliminate an unnecessary array

Conflicts:
	libavcodec/hevc.c

See: 255086a7Merged-by: Michael Niedermayer <michaelni@gmx.at>