[MPlayer-cvslog] r26410 - in trunk/libmpdemux: demux_rawaudio.c demux_rawvideo.c demuxer.c

[uau]

Author: uau
Date: Sat Apr 12 17:51:05 2008
New Revision: 26410

Log:
Remove global demuxer_type

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


Modified:
   trunk/libmpdemux/demux_rawaudio.c
   trunk/libmpdemux/demux_rawvideo.c
   trunk/libmpdemux/demuxer.c

Modified: trunk/libmpdemux/demux_rawaudio.c
==============================================================================
--- trunk/libmpdemux/demux_rawaudio.c	(original)
+++ trunk/libmpdemux/demux_rawaudio.c	Sat Apr 12 17:51:05 2008
@@ -13,7 +13,6 @@
 #include "stheader.h"
 
 
-extern int demuxer_type;
 static int channels = 2;
 static int samplerate = 44100;
 static int samplesize = 2;

Modified: trunk/libmpdemux/demux_rawvideo.c
==============================================================================
--- trunk/libmpdemux/demux_rawvideo.c	(original)
+++ trunk/libmpdemux/demux_rawvideo.c	Sat Apr 12 17:51:05 2008
@@ -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;

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Sat Apr 12 17:51:05 2008
@@ -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 f
   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;