diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:29:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:29:31 +0100 |
| commit | 4b7c81c3e059ae08e4aa74222de1762342ef8abf (patch) | |
| tree | 86f804f2006b9c32d01d291bb2a20ff3fe56d542 | |
| parent | 2220f13d8227bf769aec3a699b34b1025f976c8e (diff) | |
| parent | 870a0c669e536d56c6325d84f65e34c53792398e (diff) | |
| download | ffmpeg-4b7c81c3e059ae08e4aa74222de1762342ef8abf.tar.gz | |
Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'
* commit '870a0c669e536d56c6325d84f65e34c53792398e':
build: The libopencore-amrnb encoder depends on audio_frame_queue
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f08c83c47f..2c67cb8069 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -679,8 +679,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o \ audio_frame_queue.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o \ audio_frame_queue.o -OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o \ - audio_frame_queue.o +OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o audio_frame_queue.o OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o |