Revert "fix bad merge"

This reverts commit 85942727d82b66a30a6e4c394673015856bc5af8.
Revert "fix FB Scalability"

This reverts commit 0a295ca2acdbecf941feba38604bb535baa7bd69.
fix FB Scalability

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c
add a flush for SHVC decoders
clean

Conflicts:
	libavcodec/hevc.c
test the nalu type

Conflicts:
	libavcodec/pthread_frame.c
compute right POC at el

Conflicts:
	libavcodec/hevc.c
update last temporal id
fix frame based for SHVC
Merge branch 'hevc_rext' of https://github.com/OpenHEVC/openHEVC.git into hevc_rext