From 078a8dd66d8172f12c780b723bcc70a9c4d7abec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Paesa?= <wzrlpy@arsystel.com>
Date: Fri, 18 Mar 2005 02:13:13 +0000
Subject: [PATCH] =?UTF-8?q?ogg=20has=20to=20be=20at=20the=20right=20of=20v?=
 =?UTF-8?q?orbis=20patch=20by=20("V=C3=ADctor=20Paesa"=20wzrlpy=20hotmail?=
 =?UTF-8?q?=20com)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally committed as revision 4055 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile            | 4 ++--
 libavcodec/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7c2cd937f2..19cf90669d 100644
--- a/Makefile
+++ b/Makefile
@@ -44,13 +44,13 @@ endif
 endif
 
 ifeq ($(CONFIG_LIBOGG),yes)
-EXTRALIBS+= -logg 
 ifeq ($(CONFIG_LIBVORBIS),yes)
-EXTRALIBS+= -lvorbis -lvorbisenc
+EXTRALIBS+= -lvorbisenc -lvorbis
 endif
 ifeq ($(CONFIG_LIBTHEORA),yes)
 EXTRALIBS+= -ltheora
 endif
+EXTRALIBS+= -logg
 endif
 
 ifeq ($(CONFIG_FAAD),yes)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c15e2761c4..8a966706c2 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -125,15 +125,15 @@ EXTRALIBS += -lmp3lame
 endif
 
 ifeq ($(CONFIG_LIBOGG),yes)
-EXTRALIBS += -logg
 ifeq ($(CONFIG_LIBVORBIS),yes)
 OBJS += oggvorbis.o
-EXTRALIBS += -lvorbis -lvorbisenc
+EXTRALIBS += -lvorbisenc -lvorbis
 endif
 ifeq ($(CONFIG_LIBTHEORA), yes)
 OBJS += oggtheora.o
 EXTRALIBS += -ltheora
 endif
+EXTRALIBS += -logg
 endif
 
 ifeq ($(TARGET_GPROF),yes)