[FFmpeg-cvslog] configure, libavcodec/Makefile: Fix avrn dependencies

Andreas Rheinhardt git at videolan.org
Tue Feb 23 12:36:11 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Feb  9 22:13:13 2021 +0100| [7bf2b76b4190e35b61d2c477d7e9fa2e0b6d7566] | committer: Andreas Rheinhardt

configure, libavcodec/Makefile: Fix avrn dependencies

The avrn decoder actually only needs one thing: The MJPEG decoder.
Instead the Makefile made it compile mjpegdec and configure required
some of the prerequisites of the MJPEG decoder (exif and jpegtables).
Even if all the prerequisites of the MJPEG decoder were required, it
would still not make the MJPEG decoder usable, because for that
the MJPEG decoder needs to be in the list of codecs in codec_list.c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bf2b76b4190e35b61d2c477d7e9fa2e0b6d7566
---

 configure           | 2 +-
 libavcodec/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index b5ef35c034..a66085d6ed 100755
--- a/configure
+++ b/configure
@@ -2688,7 +2688,7 @@ atrac3p_decoder_select="mdct sinewin"
 atrac3pal_decoder_select="mdct sinewin"
 atrac9_decoder_select="mdct"
 av1_decoder_select="cbs_av1"
-avrn_decoder_select="exif jpegtables"
+avrn_decoder_select="mjpeg_decoder"
 bink_decoder_select="blockdsp hpeldsp"
 binkaudio_dct_decoder_select="mdct rdft dct sinewin wma_freqs"
 binkaudio_rdft_decoder_select="mdct rdft sinewin wma_freqs"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 53ccda9152..0832877686 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -231,7 +231,7 @@ OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
 OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
 OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o
 OBJS-$(CONFIG_AV1_CUVID_DECODER)       += cuviddec.o
-OBJS-$(CONFIG_AVRN_DECODER)            += avrndec.o mjpegdec.o
+OBJS-$(CONFIG_AVRN_DECODER)            += avrndec.o
 OBJS-$(CONFIG_AVRP_DECODER)            += r210dec.o
 OBJS-$(CONFIG_AVRP_ENCODER)            += r210enc.o
 OBJS-$(CONFIG_AVS_DECODER)             += avs.o



More information about the ffmpeg-cvslog mailing list