[Mplayer-cvslog] CVS: main/libmpdemux aviheader.c, 1.60, 1.61 demux_ts.c, 1.15, 1.16

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv4012

Modified Files:
	aviheader.c demux_ts.c 
Log Message:
small fixes


Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- aviheader.c	30 Jun 2004 22:50:56 -0000	1.60
+++ aviheader.c	28 Aug 2004 20:56:56 -0000	1.61
@@ -27,6 +27,7 @@
 extern void print_index(AVIINDEXENTRY *idx,int idx_size);
 extern void print_avistdindex_chunk(avistdindex_chunk *h);
 extern void print_avisuperindex_chunk(avisuperindex_chunk *h);
+extern void print_vprp(VideoPropHeader *vprp);
 
 static int odml_get_vstream_id(int id, unsigned char res[])
 {

Index: demux_ts.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- demux_ts.c	18 Jun 2004 20:02:05 -0000	1.15
+++ demux_ts.c	28 Aug 2004 20:56:56 -0000	1.16
@@ -36,7 +36,7 @@
 
 #include "bswap.h"
 #include "../unrarlib.h"
-
+#include "../liba52/a52.h" 
 
 #define TS_FEC_PACKET_SIZE 204
 #define TS_PACKET_SIZE 188
@@ -1361,7 +1361,7 @@
 		if(priv->pmt == NULL)
 		{
 			mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT: COULDN'T REALLOC %d bytes, NEXT\n", sz);
-			return NULL;
+			return 0;
 		}
 
 		idx = priv->pmt_cnt;
@@ -1404,7 +1404,7 @@
 	{
 		mp_msg(MSGT_DEMUX, MSGL_V, "FILL_PMT(prog=%d, PID=%d), ERROR! PMT TOO LONG, IGNORING\n", progid, pid);
 		pmt->buffer_len = 0;
-		return NULL;
+		return 0;
 	}
 
 	memcpy(&(pmt->buffer[pmt->buffer_len]), &buff[m], size - m);