mirror of https://github.com/mpv-player/mpv
Remove global demuxer_type
It was only used inside one function. Change it to a local variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26410 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
43ff8aa004
commit
660ba18378
|
@ -13,7 +13,6 @@
|
|||
#include "stheader.h"
|
||||
|
||||
|
||||
extern int demuxer_type;
|
||||
static int channels = 2;
|
||||
static int samplerate = 44100;
|
||||
static int samplesize = 2;
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
|
||||
#include "libmpcodecs/img_format.h"
|
||||
|
||||
extern int demuxer_type;
|
||||
static int format = IMGFMT_I420;
|
||||
static int size_id = 0;
|
||||
static int width = 0;
|
||||
|
|
|
@ -844,7 +844,6 @@ return demuxer;
|
|||
|
||||
char* audio_stream = NULL;
|
||||
char* sub_stream = NULL;
|
||||
int demuxer_type = 0; // used by rawaudio and rawvideo
|
||||
int audio_stream_cache = 0;
|
||||
|
||||
char *demuxer_name = NULL; // parameter from -demuxer
|
||||
|
@ -861,6 +860,7 @@ demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int
|
|||
demuxer_t *vd,*ad = NULL,*sd = NULL;
|
||||
demuxer_t *res;
|
||||
int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ;
|
||||
int demuxer_type;
|
||||
int audio_demuxer_type = 0, sub_demuxer_type = 0;
|
||||
int demuxer_force = 0, audio_demuxer_force = 0,
|
||||
sub_demuxer_force = 0;
|
||||
|
|
Loading…
Reference in New Issue