diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-10-22 23:24:34 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-10-22 23:24:34 +0000 |
| commit | c5e27f4d608a79be8aab54402cf7d9652cea17d1 (patch) | |
| tree | ad13adf28e468ce95122711a070ba3f481e6305b /src/demuxers | |
| parent | 89be3dd0e40052c80da727c2b2cd763114d3704c (diff) | |
| download | xine-lib-c5e27f4d608a79be8aab54402cf7d9652cea17d1.tar.gz xine-lib-c5e27f4d608a79be8aab54402cf7d9652cea17d1.tar.bz2 | |
an http input plugin, small demuxer bugfixes/additions
CVS patchset: 862
CVS date: 2001/10/22 23:24:34
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 13 | ||||
| -rw-r--r-- | src/demuxers/demux_mpgaudio.c | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 832340f52..e3f11195f 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg.c,v 1.38 2001/10/20 02:01:51 guenter Exp $ + * $Id: demux_mpeg.c,v 1.39 2001/10/22 23:24:34 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -785,9 +785,10 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, char *MRL = input->get_mrl(input); media = strstr(MRL, "://"); - if(media) { - if((!(strncasecmp(MRL, "stdin", 5))) + if (media) { + if ((!(strncasecmp(MRL, "stdin", 5))) || (!(strncasecmp(MRL, "fifo", 4)))) { + if(!(strncasecmp(media+3, "mpeg1", 5))) { this->input = input; return DEMUX_CAN_HANDLE; @@ -798,9 +799,6 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, fprintf(stderr, "You should specify mpeg(mpeg1/mpeg2) stream type.\n"); return DEMUX_CANNOT_HANDLE; } - else if(strncasecmp(MRL, "file", 4)) { - return DEMUX_CANNOT_HANDLE; - } } ending = strrchr(MRL, '.'); @@ -811,7 +809,8 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, return DEMUX_CANNOT_HANDLE; if(!strcasecmp(ending, ".mpg") - || (!strcasecmp(ending, ".mpeg"))) { + || (!strcasecmp(ending, ".mpeg")) + || (!strcasecmp(ending, ".mpe"))) { this->input = input; return DEMUX_CAN_HANDLE; } diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index da4421b99..dafcc1e35 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpgaudio.c,v 1.24 2001/10/20 02:01:51 guenter Exp $ + * $Id: demux_mpgaudio.c,v 1.25 2001/10/22 23:24:34 guenter Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -384,7 +384,9 @@ static int demux_mpgaudio_open(demux_plugin_t *this_gen, return DEMUX_CANNOT_HANDLE; if(!strcasecmp(suffix, ".mp3") - || (!strcasecmp(suffix, ".mp2"))) { + || (!strcasecmp(suffix, ".mp2")) + || (!strcasecmp(suffix, ".mpa")) + || (!strcasecmp(suffix, ".mpega"))) { this->input = input; return DEMUX_CAN_HANDLE; } |