summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ogg.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-15 22:38:30 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-15 22:38:30 +0000
commit0013558c0666ad9b94c21ea7d7e2213025f5d729 (patch)
tree495ec3d2817a44b9c54cfa6b9850d1448bb0037a /libmpdemux/demux_ogg.c
parent84cc3f7ca3062cc66173632aaf0dc16c204743e9 (diff)
downloadmpv-0013558c0666ad9b94c21ea7d7e2213025f5d729.tar.bz2
mpv-0013558c0666ad9b94c21ea7d7e2213025f5d729.tar.xz
removed dummy OGG functions - use #ifdef instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7414 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
-rw-r--r--libmpdemux/demux_ogg.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 08d22b9677..853e888a8d 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -1,6 +1,7 @@
#include "config.h"
+#ifdef HAVE_OGGVORBIS
#include <stdlib.h>
#include <stdio.h>
@@ -11,28 +12,6 @@
#include "demuxer.h"
#include "stheader.h"
-#ifndef HAVE_OGGVORBIS
-/// Some dummy function to use when no Ogg and Vorbis lib are avaible
-int demux_ogg_open(demuxer_t* demuxer) {
- return 0;
-}
-
-int demux_ogg_fill_buffer(demuxer_t *d) {
- return 0;
-}
-
-demuxer_t* init_avi_with_ogg(demuxer_t* demuxer) {
- mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_NoOggVorbis);
- // disable audio
- demuxer->audio->id = -2;
- return demuxer;
-}
-
-void demux_close_ogg(demuxer_t* demuxer) {
-
-}
-#else
-
#include <ogg/ogg.h>
#include <vorbis/codec.h>