Merge branch 'hevc' of https://github.com/OpenHEVC/openHEVC into shvc4.0
Merge branch 'shvc4.0' of https://github.com/OpenHEVC/openHEVC into shvc4.0
Merge branch 'shvc4.0' of https://github.com/OpenHEVC/openHEVC into shvc4.0
Merge branch 'shvc4.0' of https://github.com/OpenHEVC/openHEVC into shvc4.0
Merge branch 'shvc4.0' of https://github.com/OpenHEVC/openHEVC into shvc4.0
Merge branch 'shvc4.0' of https://github.com/OpenHEVC/openHEVC into shvc4.0
Merge branch 'shvc4.0' of https://github.com/OpenHEVC/openHEVC into shvc4.0
fix frame based deadlock