Mercurial > mplayer.hg
changeset 32693:2290be558d55
Fix compiler warnings in ao_dxr2.c and vo_dxr2.c
| author | ranma |
|---|---|
| date | Tue, 11 Jan 2011 00:09:59 +0000 |
| parents | 4040f4df69f0 |
| children | 3c1c3676df94 |
| files | libao2/ao_dxr2.c libvo/vo_dxr2.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_dxr2.c Tue Jan 11 00:07:52 2011 +0000 +++ b/libao2/ao_dxr2.c Tue Jan 11 00:09:59 2011 +0000 @@ -175,9 +175,11 @@ return y; } +/* write_dxr2 from libvo/dxr2.c */ +extern int write_dxr2(const unsigned char *data, int len); + static void dxr2_send_lpcm_packet(unsigned char* data,int len,int id,unsigned int timestamp,int freq_id) { - int write_dxr2(const unsigned char *data, int len); if(dxr2_fd < 0) { mp_msg(MSGT_AO,MSGL_ERR,"DXR2 fd is not valid\n"); @@ -196,7 +198,6 @@ // it should round it down to outburst*n // return: number of bytes played static int play(void* data,int len,int flags){ - int write_dxr2(const unsigned char *data, int len); // MPEG and AC3 don't work :-( if(ao_data.format==AF_FORMAT_MPEG2)
--- a/libvo/vo_dxr2.c Tue Jan 11 00:07:52 2011 +0000 +++ b/libvo/vo_dxr2.c Tue Jan 11 00:09:59 2011 +0000 @@ -166,6 +166,9 @@ static unsigned char dxr2buf[BUF_SIZE]; static unsigned int dxr2bufpos = 0; +int write_dxr2(const unsigned char *data, int len); +void dxr2_send_sub_packet(unsigned char* data,int len,int id,unsigned int timestamp); + int write_dxr2(const unsigned char *data, int len) { int w = 0; @@ -460,7 +463,6 @@ uint8_t* src[] = { sub_img, NULL, NULL }; int stride[] = { movie_w * 3 , 0, 0 }; dxr2_twoArg_t win; - int redisp = 0; int cc = vo_config_count; vo_config_count = sub_config_count; sub_vo->draw_slice(src,stride,movie_w,movie_h,0,0);