Merge to master
Move stdio/event input to its own thread and create a unified message queue for events from that thread and the CEC thread.
Fix the position of a call to htsp_unlock()
Add --deinterlace-sd (<= 720x576) and --deinterlace-hd (> 720x576) options.  Note that by default de-interlacing is now disabled (it was previously enabled for any MPEG-2 stream
First steps towards improving the OSD system - the OSD info screen now updates when on-screen.
Remove stray break statement
Handle mono MPEG audio streams (force libmpg123 to always output stereo)
Process audio_type field in subscriptionStart message (available in tvh as of today) and remove some duplication
Deal with zero timeout in msgqueue_get - this returns immediately if the queue is empty
First attempt at switching audio streams - use 'a' to cycle through the available streams.  No UI yet.
Update pidvbip.conf.example with last set of configfile changes
Only set the audio omx buffer flags if a frame has been decoded successfully - this fixes some avplay playback failures.  Also deal with AAC streams without ADTS headers in every frame (again, for avplay usage).
Make avplay() a little less verbose
Set DTS to -1 in avplay() to avoid DTS discontinuity messages (we are ignoring DTS in avplay)
Remove a debug fprintf
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:andyb2000/pidvbip into onscreenepg

Conflicts:
	osd.h
	pidvbip.c