(AVC/SP) Ensure decoder will close correctly