# HG changeset patch
# User uau
# Date 1208015465 0
# Node ID 2dc23fc4724adf10197547dbcd32d8e8262448c9
# Parent  e03e2d2204b6de8f301e6e16269b71f222d9db4f
Remove global demuxer_type

It was only used inside one function. Change it to a local variable.

diff -r e03e2d2204b6 -r 2dc23fc4724a libmpdemux/demux_rawaudio.c
--- a/libmpdemux/demux_rawaudio.c	Sat Apr 12 15:51:02 2008 +0000
+++ b/libmpdemux/demux_rawaudio.c	Sat Apr 12 15:51:05 2008 +0000
@@ -13,7 +13,6 @@
 #include "stheader.h"
 
 
-extern int demuxer_type;
 static int channels = 2;
 static int samplerate = 44100;
 static int samplesize = 2;
diff -r e03e2d2204b6 -r 2dc23fc4724a libmpdemux/demux_rawvideo.c
--- a/libmpdemux/demux_rawvideo.c	Sat Apr 12 15:51:02 2008 +0000
+++ b/libmpdemux/demux_rawvideo.c	Sat Apr 12 15:51:05 2008 +0000
@@ -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 -r e03e2d2204b6 -r 2dc23fc4724a libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Sat Apr 12 15:51:02 2008 +0000
+++ b/libmpdemux/demuxer.c	Sat Apr 12 15:51:05 2008 +0000
@@ -844,7 +844,6 @@
 
 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 *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;