diff --git a/configure b/configure
index 72aeaf0d5f..15c5c615eb 100755
--- a/configure
+++ b/configure
@@ -7061,6 +7061,7 @@ AV_DEP = $_dep_libavutil $_dep_libavcodec $_dep_libavformat
 AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil 
 CONFIG_LIBAVUTIL = $_libavutil_required
 CONFIG_LIBAVCODEC = $_libavcodec
+CONFIG_LIBAVCODECSO = $_libavcodecso
 CONFIG_LIBAVFORMAT = $_libavformat
 ZORAN = $_zr
 FAME = $_fame
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 909aef1907..370e1307d8 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -192,6 +192,10 @@ LIBAV_INC += -I../libavcodec
 ENCODER_SRCS += ae_lavc.c
 endif
 
+ifeq ($(CONFIG_LIBAVCODECSO),yes)
+ENCODER_SRCS += ae_lavc.c
+endif
+
 ifeq ($(MUSEPACK),yes)
 AUDIO_SRCS += ad_mpc.c
 endif