mirror of https://github.com/mpv-player/mpv
small fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13188 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
0eb98079d5
commit
4da367942a
|
@ -27,6 +27,7 @@ extern void print_video_header(BITMAPINFOHEADER *h);
|
||||||
extern void print_index(AVIINDEXENTRY *idx,int idx_size);
|
extern void print_index(AVIINDEXENTRY *idx,int idx_size);
|
||||||
extern void print_avistdindex_chunk(avistdindex_chunk *h);
|
extern void print_avistdindex_chunk(avistdindex_chunk *h);
|
||||||
extern void print_avisuperindex_chunk(avisuperindex_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[])
|
static int odml_get_vstream_id(int id, unsigned char res[])
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
#include "bswap.h"
|
#include "bswap.h"
|
||||||
#include "../unrarlib.h"
|
#include "../unrarlib.h"
|
||||||
|
#include "../liba52/a52.h"
|
||||||
|
|
||||||
#define TS_FEC_PACKET_SIZE 204
|
#define TS_FEC_PACKET_SIZE 204
|
||||||
#define TS_PACKET_SIZE 188
|
#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)
|
if(priv->pmt == NULL)
|
||||||
{
|
{
|
||||||
mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT: COULDN'T REALLOC %d bytes, NEXT\n", sz);
|
mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT: COULDN'T REALLOC %d bytes, NEXT\n", sz);
|
||||||
return NULL;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
idx = priv->pmt_cnt;
|
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);
|
mp_msg(MSGT_DEMUX, MSGL_V, "FILL_PMT(prog=%d, PID=%d), ERROR! PMT TOO LONG, IGNORING\n", progid, pid);
|
||||||
pmt->buffer_len = 0;
|
pmt->buffer_len = 0;
|
||||||
return NULL;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(&(pmt->buffer[pmt->buffer_len]), &buff[m], size - m);
|
memcpy(&(pmt->buffer[pmt->buffer_len]), &buff[m], size - m);
|
||||||
|
|
|
@ -168,7 +168,7 @@ int rtsp_session_read (rtsp_session_t *this, char *data, int len) {
|
||||||
to_copy -= fill;
|
to_copy -= fill;
|
||||||
dest += fill;
|
dest += fill;
|
||||||
this->recv_read = 0;
|
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;
|
source = this->recv;
|
||||||
fill = this->recv_size;
|
fill = this->recv_size;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue