Merge from 1.1 branch.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 38ad0be82..d29b08c49 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -120,7 +120,7 @@
 
 #define BUFSIZE 16384
 
-#define NOPID 0xffff
+#define DVB_NOPID 0xffff
 
 /* define stream types 
  * administrative/system PIDs first */
@@ -662,7 +662,7 @@ static int dvb_set_pidfilter(dvb_input_plugin_t * this, int filter, ushort pid,
 {
     tuner_t *tuner = this->tuner;
 
-   if(this->channels[this->channel].pid [filter] !=NOPID) {
+   if(this->channels[this->channel].pid [filter] !=DVB_NOPID) {
       ioctl(tuner->fd_pidfilter[filter], DMX_STOP);
     }
    
@@ -685,7 +685,7 @@ static int dvb_set_sectfilter(dvb_input_plugin_t * this, int filter, ushort pid,
 {
     tuner_t *tuner = this->tuner;
 
-    if(this->channels[this->channel].pid [filter] !=NOPID) {
+    if(this->channels[this->channel].pid [filter] !=DVB_NOPID) {
       ioctl(tuner->fd_pidfilter[filter], DMX_STOP);
     }
     
@@ -1153,7 +1153,7 @@ static void parse_pmt(dvb_input_plugin_t *this, const unsigned char *buf, int se
 	    * parsing the descriptor. */
 	    if(has_subs <= MAX_SUBTITLES) {
               xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: Adding SUBTITLES: PID 0x%04x\n", elementary_pid);
-               if(this->channels[this->channel].subpid [has_subs] !=NOPID) {
+               if(this->channels[this->channel].subpid [has_subs] !=DVB_NOPID) {
                   ioctl(this->tuner->fd_subfilter[has_subs], DMX_STOP);
                }
                this->channels[this->channel].subpid [has_subs] = elementary_pid;
@@ -3063,7 +3063,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
 
     /* Clear all pids, the pmt will tell us which to use */
     for (x = 0; x < MAX_FILTERS; x++){
-      this->channels[this->channel].pid[x] = NOPID;
+      this->channels[this->channel].pid[x] = DVB_NOPID;
     }