Merge from 1.1, dropping the README change.

--HG--
rename : debian/dh_xine => debian/dh_xine.in

1 files changed, 4 insertions, 4 deletions

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 74365cc44..6b791d355 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1249,8 +1249,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) {
     xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: Error setting up Internal PAT filter - reverting to rc6 hehaviour\n");
     dvb_set_pidfilter (this,VIDFILTER,this->channels[this->channel].pid[VIDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP);
     dvb_set_pidfilter (this,AUDFILTER,this->channels[this->channel].pid[AUDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP);
-    free(tmpbuffer);
-    return;
+    goto done;
   }
   result = read (tuner->fd_pidfilter[INTERNAL_FILTER], tmpbuffer, 3);
 
@@ -1291,10 +1290,10 @@ static void dvb_parse_si(dvb_input_plugin_t *this) {
 
   if((poll(&pfd,1,15000)<1) || this->channels[this->channel].pmtpid==0) /* PMT timed out or couldn't be found - default to using channels.conf info */
   {
-    xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: WARNING **** Reverting to rc6 hehaviour. Please regenerate your channels.conf in ?zap format ****\n");
+    xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: PMT scan timed out. Using video & audio PID info from channels.conf.\n");
     dvb_set_pidfilter (this,VIDFILTER,this->channels[this->channel].pid[VIDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP);
     dvb_set_pidfilter (this,AUDFILTER,this->channels[this->channel].pid[AUDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP);
-    return;
+    goto done;
   }
   result = read(tuner->fd_pidfilter[INTERNAL_FILTER],tmpbuffer,3);
 
@@ -1322,6 +1321,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) {
 
   xprintf(this->stream->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Setup of PID filters complete\n");
 
+done:
   free(tmpbuffer);
 }