summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2002-10-27 00:27:26 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2002-10-27 00:27:26 +0000
commit01fe9e47e5c03c959dd0428d439db3cc74e5a741 (patch)
tree5c7f464e955e1b08b5519a216da38049de1489a1 /src
parent6673bb023265e262044e4a2784db0a16113f3f52 (diff)
downloadxine-lib-01fe9e47e5c03c959dd0428d439db3cc74e5a741.tar.gz
xine-lib-01fe9e47e5c03c959dd0428d439db3cc74e5a741.tar.bz2
another demuxer with broken status reporting
CVS patchset: 3033 CVS date: 2002/10/27 00:27:26
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/Makefile.am8
-rw-r--r--src/demuxers/demux_mpgaudio.c3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 18028e01f..eedf2a462 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -6,9 +6,9 @@ libdir = $(XINE_PLUGINDIR)
# Sensing of OGG/VORBIS, ZLIB and ASF is broken in cvscompile.sh.
-#if HAVE_VORBIS
-#ogg_module = xineplug_dmx_ogg.la
-#endif
+if HAVE_VORBIS
+ogg_module = xineplug_dmx_ogg.la
+endif
#if HAVE_ZLIB
#qt_modules = xineplug_dmx_qt.la
@@ -35,7 +35,7 @@ endif
# xineplug_dmx_yuv4mpeg2.la xineplug_dmx_real.la
# xineplug_dmx_mpeg_pes.la xineplug_dmx_mpeg_ts.la
-lib_LTLIBRARIES = $(asf_module) xineplug_dmx_avi.la\
+lib_LTLIBRARIES = $(ogg_module) $(asf_module) xineplug_dmx_avi.la\
xineplug_dmx_mpeg_block.la \
xineplug_dmx_mpeg.la \
xineplug_dmx_mpeg_audio.la \
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 11cda2bd7..27fb1849e 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.71 2002/10/26 22:00:53 guenter Exp $
+ * $Id: demux_mpgaudio.c,v 1.72 2002/10/27 00:27:26 guenter Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -448,6 +448,7 @@ static void demux_mpgaudio_send_headers (demux_plugin_t *this_gen) {
this->stream_length = 0;
this->bitrate = 0;
this->last_pts = 0;
+ this->status = DEMUX_OK;
this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;