diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-28 16:13:07 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-28 16:13:07 +0000 |
| commit | b256f9755df56f45c6df438c5824d737509bc235 (patch) | |
| tree | a92c1c394cd9e59eea7ebed10e97cd9a80d6044a | |
| parent | ec5fc9a087e77f1fa577c235773932afc19665af (diff) | |
| download | xine-lib-0.9.6.tar.gz xine-lib-0.9.6.tar.bz2 | |
last 0.9.6 preparationsxine-0_9_6-release0.9.6
CVS patchset: 1124
CVS date: 2001/11/28 16:13:07
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 0cd458f50..863acb92f 100644 --- a/configure.in +++ b/configure.in @@ -25,10 +25,10 @@ dnl set XINE_BIN_AGE _and_ XINE_IFACE_AGE to 0. dnl XINE_MAJOR=0 XINE_MINOR=9 -XINE_SUB=5 -XINE_PRE="cvs" -XINE_IFACE_AGE=0 -XINE_BIN_AGE=0 +XINE_SUB=6 +XINE_PRE="" +XINE_IFACE_AGE=1 +XINE_BIN_AGE=1 AC_SUBST(XINE_MAJOR) AC_SUBST(XINE_MINOR) diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 418361721..cd272d55b 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_block.c,v 1.63 2001/11/27 00:00:34 jcdutton Exp $ + * $Id: demux_mpeg_block.c,v 1.64 2001/11/28 16:13:07 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -910,7 +910,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, media = strstr(MRL, "://"); if(media) { - if(!strncmp(MRL, "dvd", 3) || !strncmp(MRL, "d4d", 3) + if(!strncmp(MRL, "dvd", 3) || !strncmp(MRL, "d4d", 3) || !strncmp(MRL, "dmd", 3) || (((!strncmp(MRL, "stdin", 5) || !strncmp(MRL, "fifo", 4)) && (!strncmp((media+3), "mpeg2", 5) ))) ) { |