fix FB Scalability

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c
fix bad merge