From 244d22452c7d40891627e5f7e376558d6b5d8582 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 11 Jul 2016 23:21:19 +0200 Subject: [PATCH] lavc/Makefile: Fix standalone compilation of the lame encoder. Also fix a possible issue with the mpegaudio audiotoolbox decoders. Fixes ticket #5703. --- libavcodec/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 83a40ea4a9..78cd36c27a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -839,9 +839,9 @@ OBJS-$(CONFIG_AMR_NB_AT_DECODER) += audiotoolboxdec.o OBJS-$(CONFIG_EAC3_AT_DECODER) += audiotoolboxdec.o OBJS-$(CONFIG_GSM_MS_AT_DECODER) += audiotoolboxdec.o OBJS-$(CONFIG_ILBC_AT_DECODER) += audiotoolboxdec.o -OBJS-$(CONFIG_MP1_AT_DECODER) += audiotoolboxdec.o mpegaudiodecheader.o -OBJS-$(CONFIG_MP2_AT_DECODER) += audiotoolboxdec.o mpegaudiodecheader.o -OBJS-$(CONFIG_MP3_AT_DECODER) += audiotoolboxdec.o mpegaudiodecheader.o +OBJS-$(CONFIG_MP1_AT_DECODER) += audiotoolboxdec.o mpegaudiodata.o mpegaudiodecheader.o +OBJS-$(CONFIG_MP2_AT_DECODER) += audiotoolboxdec.o mpegaudiodata.o mpegaudiodecheader.o +OBJS-$(CONFIG_MP3_AT_DECODER) += audiotoolboxdec.o mpegaudiodata.o mpegaudiodecheader.o OBJS-$(CONFIG_PCM_MULAW_AT_DECODER) += audiotoolboxdec.o OBJS-$(CONFIG_PCM_ALAW_AT_DECODER) += audiotoolboxdec.o OBJS-$(CONFIG_QDMC_AT_DECODER) += audiotoolboxdec.o @@ -862,7 +862,7 @@ OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsmenc.o OBJS-$(CONFIG_LIBILBC_DECODER) += libilbc.o OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o OBJS-$(CONFIG_LIBKVAZAAR_ENCODER) += libkvazaar.o -OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o +OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodata.o mpegaudiodecheader.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o