diff options
| -rw-r--r-- | libmpdemux/aviheader.c | 1 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.c | 6 | ||||
| -rw-r--r-- | libmpdemux/realrtsp/rtsp_session.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index f7cda06303..a5e912a366 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -27,6 +27,7 @@ extern void print_video_header(BITMAPINFOHEADER *h); 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[]) { 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); diff --git a/libmpdemux/realrtsp/rtsp_session.c b/libmpdemux/realrtsp/rtsp_session.c index 2cc789fd6f..013e4fe2bc 100644 --- a/libmpdemux/realrtsp/rtsp_session.c +++ b/libmpdemux/realrtsp/rtsp_session.c @@ -168,7 +168,7 @@ int rtsp_session_read (rtsp_session_t *this, char *data, int len) { to_copy -= fill; dest += fill; this->recv_read = 0; - this->recv_size = real_get_rdt_chunk (this->s, &(this->recv)); + this->recv_size = real_get_rdt_chunk (this->s, (char **)&(this->recv)); source = this->recv; fill = this->recv_size; |