summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rwxr-xr-xconfigure2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 285291a278..0cb776aadf 100644
--- a/Makefile
+++ b/Makefile
@@ -193,8 +193,6 @@ SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
-SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \
- libmpdemux/demux_ogg.c
SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
libmpdemux/demux_rtp_codec.cpp \
stream/stream_live555.c
@@ -288,6 +286,8 @@ SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c
SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
SRCS_COMMON-$(VCD) += stream/stream_vcd.c
+SRCS_COMMON-$(VORBIS) += libmpcodecs/ad_libvorbis.c \
+ libmpdemux/demux_ogg.c
SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c
SRCS_COMMON-$(WIN32_EMULATION) += loader/elfdll.c \
loader/ext.c \
diff --git a/configure b/configure
index 7e3e51181d..b934017f9c 100755
--- a/configure
+++ b/configure
@@ -8265,7 +8265,6 @@ LIBNEMESI = $_nemesi
LIBNUT = $_libnut
LIBSMBCLIENT = $_smb
LIBTHEORA = $_theora
-LIBVORBIS = $_vorbis
LIRC = $_lirc
LIVE555 = $_live
MACOSX_BUNDLE = $_macosx_bundle
@@ -8335,6 +8334,7 @@ VIDIX_S3=$_vidix_drv_s3
VIDIX_SH_VEU=$_vidix_drv_sh_veu
VIDIX_SIS=$_vidix_drv_sis
VIDIX_UNICHROME=$_vidix_drv_unichrome
+VORBIS = $_vorbis
VSTREAM = $_vstream
WII = $_wii
WIN32DLL = $_win32dll