serious bugs - 1l absinth (changed to absinth against cola inflation)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10736 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 16 insertions, 15 deletions

diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 32ebdfddc8..6d368affe8 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -519,14 +519,14 @@ got_video:
 		// bit 7: 1=last block in block chain
 		// bit 6: 1=short header (only one block?)
 		vpkg_header=stream_read_char(demuxer->stream); --len;
-		mp_dbg(MSGT_DEMUX,MSGL_DBG2, "hdr: %0.2X (len=%d) ",vpkg_header,len);
+		mp_dbg(MSGT_DEMUX,MSGL_DBG2, "hdr: %02X (len=%d) ",vpkg_header,len);
 
 		if (0x40==(vpkg_header&0xc0)) {
 		    // seems to be a very short header
 	    	    // 2 bytes, purpose of the second byte yet unknown
 	    	    int bummer;
 		    bummer=stream_read_char(demuxer->stream); --len;
- 		    mp_dbg(MSGT_DEMUX,MSGL_DBG2,  "%0.2X",bummer);
+ 		    mp_dbg(MSGT_DEMUX,MSGL_DBG2,  "%02X",bummer);
  	    	    vpkg_offset=0;
  		    vpkg_length=len;
 		} else {
@@ -535,7 +535,7 @@ got_video:
 			// sub-seqnum (bits 0-6: number of fragment. bit 7: ???)
 		        vpkg_subseq=stream_read_char(demuxer->stream);
 	                --len;
-		        mp_dbg(MSGT_DEMUX,MSGL_DBG2,  "subseq: %0.2X ",vpkg_subseq);
+		        mp_dbg(MSGT_DEMUX,MSGL_DBG2,  "subseq: %02X ",vpkg_subseq);
 			vpkg_subseq&=0x7f;
 	            }
 
@@ -543,11 +543,11 @@ got_video:
 		    // bit 14 is always one (same applies to the offset)
 		    vpkg_length=stream_read_word(demuxer->stream);
 		    len-=2;
-		    mp_dbg(MSGT_DEMUX,MSGL_DBG2, "l: %0.2X %0.2X ",vpkg_length>>8,vpkg_length&0xff);
+		    mp_dbg(MSGT_DEMUX,MSGL_DBG2, "l: %02X %02X ",vpkg_length>>8,vpkg_length&0xff);
 		    if (!(vpkg_length&0xC000)) {
 			vpkg_length<<=16;
 		        vpkg_length|=stream_read_word(demuxer->stream);
-		        mp_dbg(MSGT_DEMUX,MSGL_DBG2, "l+: %0.2X %0.2X ",(vpkg_length>>8)&0xff,vpkg_length&0xff);
+		        mp_dbg(MSGT_DEMUX,MSGL_DBG2, "l+: %02X %02X ",(vpkg_length>>8)&0xff,vpkg_length&0xff);
 	    	        len-=2;
 		    } else
 		    vpkg_length&=0x3fff;
@@ -557,17 +557,17 @@ got_video:
 		    // _end_ of the packet, so it's equal to fragment size!!!
 		    vpkg_offset=stream_read_word(demuxer->stream);
 	            len-=2;
-		    mp_dbg(MSGT_DEMUX,MSGL_DBG2, "o: %0.2X %0.2X ",vpkg_offset>>8,vpkg_offset&0xff);
+		    mp_dbg(MSGT_DEMUX,MSGL_DBG2, "o: %02X %02X ",vpkg_offset>>8,vpkg_offset&0xff);
 		    if (!(vpkg_offset&0xC000)) {
 			vpkg_offset<<=16;
 		        vpkg_offset|=stream_read_word(demuxer->stream);
-		        mp_dbg(MSGT_DEMUX,MSGL_DBG2, "o+: %0.2X %0.2X ",(vpkg_offset>>8)&0xff,vpkg_offset&0xff);
+		        mp_dbg(MSGT_DEMUX,MSGL_DBG2, "o+: %02X %02X ",(vpkg_offset>>8)&0xff,vpkg_offset&0xff);
 	    	        len-=2;
 		    } else
 		    vpkg_offset&=0x3fff;
 
 		    vpkg_seqnum=stream_read_char(demuxer->stream); --len;
-		    mp_dbg(MSGT_DEMUX,MSGL_DBG2, "seq: %0.2X ",vpkg_seqnum);
+		    mp_dbg(MSGT_DEMUX,MSGL_DBG2, "seq: %02X ",vpkg_seqnum);
 	        }
  		mp_dbg(MSGT_DEMUX,MSGL_DBG2, "\n");
                 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "blklen=%d\n", len);
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 8ae1c3f842..a91e8d3299 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -1199,7 +1199,7 @@ static int parse_pmt(ts_priv_t * priv, uint16_t progid, uint16_t pid, int is_sta
 		if(pmt->es[idx].descr_length > section_bytes - 5)
 		{
 			mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT, ES_DESCR_LENGTH TOO LARGE %d > %d, EXIT %d bytes for PMT_ES\n",
-				pmt->es[idx].descr_length, section_bytes - 5);
+				pmt->es[idx].descr_length, section_bytes - 5, section_bytes);
 			return -1;
 		}
 
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 284b3adb2c..4a23f00aa8 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -477,7 +477,8 @@ if(strncmp("dvd://",filename,6) == 0){
 
   // FIXME: to avoid nonsense error messages...
   if (strncmp("tv://", filename, 5) && strncmp("mf://", filename, 5) &&
-    strncmp("vcd://", filename, 6))
+    strncmp("vcd://", filename, 6) && strncmp("dvb://", filename, 6) &&
+    strstr(filename, "://"))
     url = url_new(filename);
   if(url) {
 	if (strcmp(url->protocol, "smb")==0){
@@ -513,7 +514,7 @@ if(strncmp("dvd://",filename,6) == 0){
     	    stream->end_pos=len;
 	    return stream;
 #else
-	    mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_SMBNotCompiled,filename);
+	    mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_SMBNotCompiled);
 	    return NULL;
 #endif
 	}
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index eea82853c1..840d70badf 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -152,7 +152,7 @@ stream_t* open_stream_full(char* filename,int mode, char** options, int* file_fo
   for(i = 0 ; auto_open_streams[i] ; i++) {
     sinfo = auto_open_streams[i];
     if(!sinfo->protocols) {
-      mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s have protocols == NULL, it's a bug\n");
+      mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name);
       continue;
     }
     for(j = 0 ; sinfo->protocols[j] ; j++) {
diff --git a/libmpdemux/stream_netstream.c b/libmpdemux/stream_netstream.c
index 720de98a75..e054a25412 100644
--- a/libmpdemux/stream_netstream.c
+++ b/libmpdemux/stream_netstream.c
@@ -166,7 +166,7 @@ static mp_net_stream_packet_t* send_net_stream_cmd(stream_t *s,uint16_t cmd,char
     return NULL;
   }
   
-  mp_msg(MSGT_STREAM,MSGL_ERR, "Unknown response to %d: %d\n",pack->cmd);
+  mp_msg(MSGT_STREAM,MSGL_ERR, "Unknown response to %d: %d\n",cmd,pack->cmd);
   free(pack);
   return NULL;
 }
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index b55b301ac0..2b7f83fe57 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -658,7 +658,7 @@ static int control(priv_t *priv, int cmd, void *arg)
 #endif
 	return TVI_CONTROL_TRUE;
     case TVI_CONTROL_TUN_GET_TUNER:
-	mp_msg(MSGT_TV, MSGL_V, "%s: get tuner\n");
+	mp_msg(MSGT_TV, MSGL_V, "%s: get tuner\n",info.short_name);
 	if (ioctl(priv->video_fd, VIDIOC_G_TUNER, &priv->tuner) < 0) {
 	    mp_msg(MSGT_TV, MSGL_ERR, "%s: ioctl get tuner failed: %s\n",
 		   info.short_name, strerror(errno));
@@ -666,7 +666,7 @@ static int control(priv_t *priv, int cmd, void *arg)
 	}
 	return TVI_CONTROL_TRUE;
     case TVI_CONTROL_TUN_SET_TUNER:
-	mp_msg(MSGT_TV, MSGL_V, "%s: set tuner\n");
+	mp_msg(MSGT_TV, MSGL_V, "%s: set tuner\n",info.short_name);
 	if (ioctl(priv->video_fd, VIDIOC_S_TUNER, &priv->tuner) < 0) {
 	    mp_msg(MSGT_TV, MSGL_ERR, "%s: ioctl set tuner failed: %s\n",
 		   info.short_name, strerror(errno));