* commit 'a062a55d':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
	libavcodec/Makefile
	libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>