RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-18 05:11:09 +00:00
Code Issues Projects Releases Wiki Activity

avformat/Makefile, amr: Add missing amr-demuxers->rawdec.o dependency

Browse Source 
Forgotten in 1f447fd954.
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>
This commit is contained in:
Andreas Rheinhardt 2022-01-06 11:23:00 +01:00
parent 5bdd8e67e6
commit 78a840e7a3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/Makefile
View File

@ -88,10 +88,10 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2enc.o
OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o
OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o
OBJS-$(CONFIG_ALP_MUXER) += 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_AMR_MUXER) += amr.o rawenc.o
OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o rawdec.o
OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o rawdec.o
OBJS-$(CONFIG_AMV_MUXER) += amvenc.o OBJS-$(CONFIG_AMV_MUXER) += amvenc.o
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o

2
libavformat/amr.c
View File

@ -66,6 +66,7 @@ static int amr_write_header(AVFormatContext *s)
} }
#endif /* CONFIG_AMR_MUXER */ #endif /* CONFIG_AMR_MUXER */
#if CONFIG_AMR_DEMUXER
static int amr_probe(const AVProbeData *p) static int amr_probe(const AVProbeData *p)
{ {
// Only check for "#!AMR" which could be amr-wb, amr-nb. // Only check for "#!AMR" which could be amr-wb, amr-nb.
@ -140,7 +141,6 @@ static int amr_read_header(AVFormatContext *s)
return 0; return 0;
} }
#if CONFIG_AMR_DEMUXER
const AVInputFormat ff_amr_demuxer = { const AVInputFormat ff_amr_demuxer = {
.name = "amr", .name = "amr",
.long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"), .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),