summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-28 20:56:56 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-28 20:56:56 +0000
commit4da367942a1ead6b55e896afa0966f3a85002ab7 (patch)
tree67fbc55801b9b602653ce841149ee087417fccdf /libmpdemux/demux_ts.c
parent0eb98079d5d5b67826298ccc3f529d2518585883 (diff)
downloadmpv-4da367942a1ead6b55e896afa0966f3a85002ab7.tar.bz2
mpv-4da367942a1ead6b55e896afa0966f3a85002ab7.tar.xz
small fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13188 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 13355156d0..b13bb89747 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -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 @@ static int parse_pmt(ts_priv_t * priv, uint16_t progid, uint16_t pid, int is_sta
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 @@ static int parse_pmt(ts_priv_t * priv, uint16_t progid, uint16_t pid, int is_sta
{
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);