From 660ba18378b96fb59e8b91ef7e7c51c8ea0a7257 Mon Sep 17 00:00:00 2001 From: uau Date: Sat, 12 Apr 2008 15:51:05 +0000 Subject: 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 --- libmpdemux/demux_rawaudio.c | 1 - libmpdemux/demux_rawvideo.c | 1 - libmpdemux/demuxer.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c index 9dd6543577..5e4ce8f84f 100644 --- a/libmpdemux/demux_rawaudio.c +++ b/libmpdemux/demux_rawaudio.c @@ -13,7 +13,6 @@ #include "stheader.h" -extern int demuxer_type; static int channels = 2; static int samplerate = 44100; static int samplesize = 2; diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index 750f290dc9..8f0e882e73 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -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; diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index d7b4228492..28d91eeaf8 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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; -- cgit v1.2.3