>From 7b0e35b1bff76f348c907a12d5541efa88bdb012 Mon Sep 17 00:00:00 2001 From: KaluaBilla <[email protected]> Date: Fri, 26 Sep 2025 07:20:21 +0530 Subject: [PATCH] fftools: rename dec_init() to ff_dec_init() to avoid libbluray symbol conflict X-Unsent: 1 To: [email protected]
Signed-off-by: KaluaBilla <[email protected]> --- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_dec.c | 2 +- fftools/ffmpeg_demux.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index c479a03..9f6488c 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -844,7 +844,7 @@ int dec_create(const OptionsContext *o, const char *arg, Scheduler *sch); * @retval ">=0" non-negative scheduler index on success * @retval "<0" an error code on failure */ -int dec_init(Decoder **pdec, Scheduler *sch, +int ff_dec_init(Decoder **pdec, Scheduler *sch, AVDictionary **dec_opts, const DecoderOpts *o, AVFrame *param_out); void dec_free(Decoder **pdec); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 521bd65..f85ea3b 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -1649,7 +1649,7 @@ static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, return 0; } -int dec_init(Decoder **pdec, Scheduler *sch, +int ff_dec_init(Decoder **pdec, Scheduler *sch, AVDictionary **dec_opts, const DecoderOpts *o, AVFrame *param_out) { diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index d2f0017..7667791 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -991,7 +991,7 @@ int ist_use(InputStream *ist, int decoding_needed, if (!ds->decoded_params) return AVERROR(ENOMEM); - ret = dec_init(&ist->decoder, d->sch, + ret = ff_dec_init(&ist->decoder, d->sch, &ds->decoder_opts, &ds->dec_opts, ds->decoded_params); if (ret < 0) return ret; -- 2.51.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
