Mercurial > mplayer.hg
changeset 13187:ec342714b8a9
small fixes
| author | rathann |
|---|---|
| date | Sat, 28 Aug 2004 20:56:56 +0000 |
| parents | c70e7ad9ef7c |
| children | f60bc2314146 |
| files | libmpdemux/aviheader.c libmpdemux/demux_ts.c libmpdemux/realrtsp/rtsp_session.c |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/aviheader.c Sat Aug 28 20:53:01 2004 +0000 +++ b/libmpdemux/aviheader.c Sat Aug 28 20:56:56 2004 +0000 @@ -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[]) {
--- a/libmpdemux/demux_ts.c Sat Aug 28 20:53:01 2004 +0000 +++ b/libmpdemux/demux_ts.c Sat Aug 28 20:56:56 2004 +0000 @@ -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);
--- a/libmpdemux/realrtsp/rtsp_session.c Sat Aug 28 20:53:01 2004 +0000 +++ b/libmpdemux/realrtsp/rtsp_session.c Sat Aug 28 20:56:56 2004 +0000 @@ -168,7 +168,7 @@ 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;