Minor changes in live and file decoder and audiosink encoder
Merge : fixes some minor conflicts