diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-06-08 13:52:21 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-06-08 13:55:30 +0000 |
| commit | 134d0f71197e2561851537bb8a65db0291c2089f (patch) | |
| tree | bb4a57a6a736ebcf0655eef1b449506c54bdded0 /libavcodec | |
| parent | b35d38bd04c2bd7d80065f7a97bcdceee8997d66 (diff) | |
| download | ffmpeg-134d0f71197e2561851537bb8a65db0291c2089f.tar.gz | |
Revert "Fix building libopencore_amrnb decoder without libopencore_amrnb encoder"
Reverting "Fix" because it disables amrwb decoder.
This reverts commit e11020a1459de122834055be93a70566ce064bcc.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 918e8c1399..f5b66f84f8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -665,6 +665,7 @@ 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_AMRWB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \ |