RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

libdemux cleanup part 1 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2315 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-10-20 20:03:10 +00:00
parent 9eb9d9fdf6
commit edc6389037
7 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/aviprint.c
View File

@ -3,8 +3,6 @@
#include <stdlib.h>
#include <unistd.h>
//extern int verbose; // defined in mplayer.c
#include "stream.h"
#include "demuxer.h"

18
libmpdemux/demux_avi.c
View File

@ -355,9 +355,20 @@ do{
//extern int audio_id;
//extern int video_id;
extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
extern int force_ni;
extern int pts_from_bps;
//extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
//extern int force_ni;
//extern int pts_from_bps;
// AVI demuxer parameters:
int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index
int force_ni=0; // force non-interleaved AVI parsing
// PTS: 0=interleaved 1=BPS-based
#ifdef AVI_SYNC_BPS
int pts_from_bps=1;
#else
int pts_from_bps=0;
#endif
void read_avi_header(demuxer_t *demuxer,int index_mode);
@ -584,7 +595,6 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
audio_chunk_pos=i; ++d_audio->pack_no;
if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){
//if(verbose)printf("break;\n");
break;
}
d_audio->dpos+=len;

1
libmpdemux/demuxer.c
View File

@ -339,7 +339,6 @@ extern int audio_id;
extern int video_id;
extern int dvdsub_id;
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);

1
libmpdemux/open.c
View File

@ -275,7 +275,6 @@ if(dvd_title){
if (len == -1)
perror("Error: lseek failed to obtain video file size");
else
if(verbose)
#ifdef _LARGEFILE_SOURCE
mp_msg(MSGT_OPEN,MSGL_V,"File size is %lld bytes\n", (long long)len);
#else

2
libmpdemux/parse_es.c
View File

@ -4,8 +4,6 @@
#include <stdlib.h>
#include <unistd.h>
extern int verbose; // defined in mplayer.c
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"

8
libmpdemux/test.c
View File

@ -23,13 +23,7 @@ void skip_audio_frame(sh_audio_t *sh_audio){
void resync_audio_stream(sh_audio_t *sh_audio){
}
// some globals:
int verbose=1;
// AVI demuxer parameters:
int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index
int force_ni=0; // force non-interleaved AVI parsing
int pts_from_bps=1; // PTS: 0=interleaved 1=BPS-based
int verbose=1; // must be global!
//---------------

11
mplayer.c
View File

@ -224,16 +224,13 @@ static int stream_dump_type=0;
extern int dvd_title;
int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index
int force_ni=0;
// AVI demuxer params:
extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
extern int force_ni;
extern int pts_from_bps;
static float default_max_pts_correction=-1;//0.01f;
static float max_pts_correction=0;//default_max_pts_correction;
#ifdef AVI_SYNC_BPS
int pts_from_bps=1;
#else
int pts_from_bps=0;
#endif
float force_fps=0;
int force_srate=0;