Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 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 | ad825aff822b |
children | fa8997230d4e |
comparison
equal
deleted
inserted
replaced
26377:e03e2d2204b6 | 26378:2dc23fc4724a |
---|---|
842 return demuxer; | 842 return demuxer; |
843 } | 843 } |
844 | 844 |
845 char* audio_stream = NULL; | 845 char* audio_stream = NULL; |
846 char* sub_stream = NULL; | 846 char* sub_stream = NULL; |
847 int demuxer_type = 0; // used by rawaudio and rawvideo | |
848 int audio_stream_cache = 0; | 847 int audio_stream_cache = 0; |
849 | 848 |
850 char *demuxer_name = NULL; // parameter from -demuxer | 849 char *demuxer_name = NULL; // parameter from -demuxer |
851 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer | 850 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer |
852 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer | 851 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer |
859 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ | 858 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ |
860 stream_t *as = NULL,*ss = NULL; | 859 stream_t *as = NULL,*ss = NULL; |
861 demuxer_t *vd,*ad = NULL,*sd = NULL; | 860 demuxer_t *vd,*ad = NULL,*sd = NULL; |
862 demuxer_t *res; | 861 demuxer_t *res; |
863 int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ; | 862 int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ; |
863 int demuxer_type; | |
864 int audio_demuxer_type = 0, sub_demuxer_type = 0; | 864 int audio_demuxer_type = 0, sub_demuxer_type = 0; |
865 int demuxer_force = 0, audio_demuxer_force = 0, | 865 int demuxer_force = 0, audio_demuxer_force = 0, |
866 sub_demuxer_force = 0; | 866 sub_demuxer_force = 0; |
867 | 867 |
868 if ((demuxer_type = get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { | 868 if ((demuxer_type = get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { |