Mercurial > mplayer.hg
changeset 26378:2dc23fc4724a
Remove global demuxer_type
It was only used inside one function. Change it to a local variable.
| author | uau |
|---|---|
| date | Sat, 12 Apr 2008 15:51:05 +0000 |
| parents | e03e2d2204b6 |
| children | fa8997230d4e |
| files | libmpdemux/demux_rawaudio.c libmpdemux/demux_rawvideo.c libmpdemux/demuxer.c |
| diffstat | 3 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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;
--- 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;