aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-06 11:23:00 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-08 19:00:26 +0100
commita20d6eb223d0be60013ba2e0f7d34599055e4347 (patch)
treea78e9476bbd37f5409f845519a784ea527e1d823
parent359836ce6c6fb8ac8dd1df208b76e2327edec9c1 (diff)
downloadffmpeg-a20d6eb223d0be60013ba2e0f7d34599055e4347.tar.gz
avformat/Makefile, amr: Add missing amr-demuxers->rawdec.o dependency
Forgotten in 1f447fd95463bbf39a78d886359a3006d82f6a94. Also only enable amr_probe() and amr_read_header() in case the AMR demuxer is enabled; this avoids having to add a rawdec.o dependency to the muxer. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 78a840e7a3b6c4b8d4f665208d4ef4506ef9f5b5)
-rw-r--r--libavformat/Makefile6
-rw-r--r--libavformat/amr.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 78a15cd7e9..07e8c4605b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -88,10 +88,10 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2enc.o
OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o
OBJS-$(CONFIG_ALP_DEMUXER) += alp.o
OBJS-$(CONFIG_ALP_MUXER) += alp.o
-OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
+OBJS-$(CONFIG_AMR_DEMUXER) += amr.o rawdec.o
OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o
-OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o
-OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o
+OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o rawdec.o
+OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o rawdec.o
OBJS-$(CONFIG_AMV_MUXER) += amvenc.o
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
OBJS-$(CONFIG_APC_DEMUXER) += apc.o
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 0a044d69af..9250089cb1 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -66,6 +66,7 @@ static int amr_write_header(AVFormatContext *s)
}
#endif /* CONFIG_AMR_MUXER */
+#if CONFIG_AMR_DEMUXER
static int amr_probe(const AVProbeData *p)
{
// Only check for "#!AMR" which could be amr-wb, amr-nb.
@@ -140,7 +141,6 @@ static int amr_read_header(AVFormatContext *s)
return 0;
}
-#if CONFIG_AMR_DEMUXER
const AVInputFormat ff_amr_demuxer = {
.name = "amr",
.long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),