RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-10 11:41:37 +00:00
Code Issues Releases Wiki Activity

uninit stream

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2322 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-10-20 23:48:56 +00:00
parent 93ad0e3b78
commit 21db4ade66
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mplayer.c
View File

@ -267,6 +267,8 @@ int abs_seek_pos=0;
extern char *vo_subdevice; extern char *vo_subdevice;
extern char *ao_subdevice; extern char *ao_subdevice;
static stream_t* stream=NULL;
static char* current_module=NULL; // for debugging static char* current_module=NULL; // for debugging
static unsigned int inited_flags=0; static unsigned int inited_flags=0;
@ -276,6 +278,7 @@ static unsigned int inited_flags=0;
#define INITED_GETCH2 8 #define INITED_GETCH2 8
#define INITED_LIRC 16 #define INITED_LIRC 16
#define INITED_ENCODE 32 #define INITED_ENCODE 32
#define INITED_STREAM 64
#define INITED_ALL 0xFFFF #define INITED_ALL 0xFFFF
void uninit_player(unsigned int mask){ void uninit_player(unsigned int mask){
@ -317,6 +320,13 @@ void uninit_player(unsigned int mask){
avi_fixate(); avi_fixate();
} }
if(mask&INITED_STREAM){
inited_flags&=~INITED_STREAM;
current_module="uninit_stream";
if(stream) free_stream(stream);
stream=NULL;
}
#ifdef HAVE_LIRC #ifdef HAVE_LIRC
if(mask&INITED_LIRC){ if(mask&INITED_LIRC){
inited_flags&=~INITED_LIRC; inited_flags&=~INITED_LIRC;
@ -442,7 +452,6 @@ int num_filenames=0;
int curr_filename=0; int curr_filename=0;
char* filename=NULL; //"MI2-Trailer.avi"; char* filename=NULL; //"MI2-Trailer.avi";
stream_t* stream=NULL;
int file_format=DEMUXER_TYPE_UNKNOWN; int file_format=DEMUXER_TYPE_UNKNOWN;
// //
int delay_corrected=1; int delay_corrected=1;
@ -745,8 +754,11 @@ play_next_file:
current_module="open_stream"; current_module="open_stream";
stream=open_stream(filename,vcd_track,&file_format); stream=open_stream(filename,vcd_track,&file_format);
if(!stream) goto goto_next_file;// exit_player(MSGTR_Exit_error); // error... if(!stream) goto goto_next_file;// exit_player(MSGTR_Exit_error); // error...
inited_flags|=INITED_STREAM;
stream->start_pos+=seek_to_byte; stream->start_pos+=seek_to_byte;
stream_enable_cache(stream,2048*1024);
use_stdin=filename && (!strcmp(filename,"-")); use_stdin=filename && (!strcmp(filename,"-"));
#ifdef HAVE_LIBCSS #ifdef HAVE_LIBCSS