From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/Makefile: fix mp2float and mp3 dependencies
Date: Wed, 5 Jan 2022 04:53:50 +0100
Message-ID: <AM7PR03MB666072F4D8004DA913FF96C08F4B9@AM7PR03MB6660.eurprd03.prod.outlook.com> (raw)
In-Reply-To: <20220105032107.1170629-1-zane@zanevaniperen.com>
Zane van Iperen:
> Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
> ---
> libavcodec/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 7dc4ccb85f..8cd2d6f849 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -481,8 +481,8 @@ OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc_float.o mpegaudio.o \
> OBJS-$(CONFIG_MP2FIXED_ENCODER) += mpegaudioenc_fixed.o mpegaudio.o \
> mpegaudiodata.o mpegaudiodsp_data.o \
> mpegaudiotabs.o
> -OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o
> -OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o
> +OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o mpegaudiodata.o
> +OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o mpegaudiodata.o
> OBJS-$(CONFIG_MP3_MF_ENCODER) += mfenc.o mf_utils.o
> OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec_fixed.o
> OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += mpegaudiodec_float.o
>
1. This is a regression since 33e6d57f01dd4742a2e25ac5fa072b487d9d02ce.
Before that all mpegaudio-decoders had a mpegaudiodata dependency via
mpegaudioheader, yet now the latter only needs (and therefore provides)
mpegaudiotabs. I should have checked for such indirect dependencies
(which should actually not exist, but they unfortunately do), but haven't.
2. This does not fix everything; e.g. it won't fix the issue in which
only the mp2 (fixed) decoder is active. Instead mpegaudio should have a
mpegaudiodata.o dependency (mpegaudio is the common group for all the
decoders that use mpegaudiodec_template). I'll send a patch that does
this (and backport it) unless you want to.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2022-01-05 3:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 3:21 Zane van Iperen
2022-01-05 3:53 ` Andreas Rheinhardt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AM7PR03MB666072F4D8004DA913FF96C08F4B9@AM7PR03MB6660.eurprd03.prod.outlook.com \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git