mirror of
https://github.com/mpv-player/mpv
synced 2025-02-16 20:27:23 +00:00
-Wall warnings fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2051 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ce8be9282b
commit
0768e4202e
@ -645,7 +645,7 @@ codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap,
|
||||
}
|
||||
|
||||
void list_codecs(int audioflag){
|
||||
int i, j;
|
||||
int i;
|
||||
codecs_t *c;
|
||||
|
||||
if (audioflag) {
|
||||
@ -657,7 +657,7 @@ void list_codecs(int audioflag){
|
||||
c = video_codecs;
|
||||
printf("vc: vfm: status: info: [lib/dll]\n");
|
||||
}
|
||||
if(!i) return NULL;
|
||||
if(!i) return;
|
||||
for (/* NOTHING */; i--; c++) {
|
||||
char* s="unknown ";
|
||||
switch(c->status){
|
||||
|
@ -359,6 +359,8 @@ extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) inde
|
||||
extern int force_ni;
|
||||
extern int pts_from_bps;
|
||||
|
||||
void read_avi_header(demuxer_t *demuxer,int index_mode);
|
||||
|
||||
demuxer_t* demux_open_avi(demuxer_t* demuxer){
|
||||
demux_stream_t *d_audio=demuxer->audio;
|
||||
demux_stream_t *d_video=demuxer->video;
|
||||
|
@ -341,6 +341,9 @@ void read_avi_header(demuxer_t *demuxer,int index_mode);
|
||||
int asf_check_header(demuxer_t *demuxer);
|
||||
int read_asf_header(demuxer_t *demuxer);
|
||||
demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id);
|
||||
demuxer_t* demux_open_avi(demuxer_t* demuxer);
|
||||
int mov_check_file(demuxer_t* demuxer);
|
||||
int mov_read_header(demuxer_t* demuxer);
|
||||
|
||||
|
||||
demuxer_t* demux_open(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){
|
||||
|
@ -54,7 +54,7 @@ void mpeg2_init (void);
|
||||
int mpeg2_decode_data (vo_functions_t *, uint8_t * data_start, uint8_t * data_end,int framedrop);
|
||||
//void mpeg2_close (vo_functions_t *);
|
||||
//void mpeg2_drop (int flag);
|
||||
|
||||
//void mpeg2_free_image_buffers (picture_t * picture)
|
||||
|
||||
/* initialize mpegdec with a opaque user pointer */
|
||||
//void mpeg2_init (mpeg2dec_t * mpeg2dec, uint32_t mm_accel
|
||||
|
@ -214,6 +214,7 @@ int slice_process (picture_t *picture, uint8_t code, uint8_t * buffer);
|
||||
void stats_header (uint8_t code, uint8_t * buffer);
|
||||
|
||||
void mpeg2_allocate_image_buffers(picture_t * picture);
|
||||
void mpeg2_free_image_buffers (picture_t * picture);
|
||||
|
||||
|
||||
#ifdef MPEG12_POSTPROC
|
||||
|
3
open.c
3
open.c
@ -113,7 +113,7 @@ if(vcd_track){
|
||||
//============ Open DVD title ==============
|
||||
#ifdef USE_DVDREAD
|
||||
if(dvd_title){
|
||||
int ret,ret2;
|
||||
// int ret,ret2;
|
||||
dvd_priv_t *d;
|
||||
int ttn,pgc_id,pgn;
|
||||
dvd_reader_t *dvd;
|
||||
@ -297,7 +297,6 @@ static int dvd_next_cell(dvd_priv_t *d){
|
||||
|
||||
if( d->cur_pgc->cell_playback[ next_cell ].block_type
|
||||
== BLOCK_TYPE_ANGLE_BLOCK ) {
|
||||
int i;
|
||||
while(next_cell<d->cur_pgc->nr_of_cells){
|
||||
if( d->cur_pgc->cell_playback[next_cell].block_mode
|
||||
== BLOCK_MODE_LAST_CELL ) break;
|
||||
|
20
stream.c
20
stream.c
@ -67,16 +67,6 @@ off_t newpos;
|
||||
|
||||
// if(verbose>=3) printf("seek to 0x%X\n",(unsigned int)pos);
|
||||
|
||||
if(verbose>=3){
|
||||
#ifdef _LARGEFILE_SOURCE
|
||||
printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n",
|
||||
(long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
|
||||
#else
|
||||
printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n",
|
||||
(unsigned int)s->pos,newpos,pos,s->buf_len);
|
||||
#endif
|
||||
}
|
||||
|
||||
s->buf_pos=s->buf_len=0;
|
||||
|
||||
switch(s->type){
|
||||
@ -93,6 +83,16 @@ if(verbose>=3){
|
||||
newpos=pos/2048; newpos*=2048; break;
|
||||
}
|
||||
|
||||
if(verbose>=3){
|
||||
#ifdef _LARGEFILE_SOURCE
|
||||
printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n",
|
||||
(long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
|
||||
#else
|
||||
printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n",
|
||||
(unsigned int)s->pos,newpos,pos,s->buf_len);
|
||||
#endif
|
||||
}
|
||||
|
||||
pos-=newpos;
|
||||
|
||||
if(newpos==0 || newpos!=s->pos){
|
||||
|
@ -25,5 +25,6 @@ typedef struct {
|
||||
|
||||
subtitle* sub_read_file (char *filename);
|
||||
char * sub_filename(char *path, char * fname );
|
||||
void list_sub_file(subtitle* subs);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user