This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 464f4407737d711ce2d26f5980fc0e4603c3f01b Author: Andreas Rheinhardt <[email protected]> AuthorDate: Fri Mar 13 15:46:28 2026 +0100 Commit: James Almer <[email protected]> CommitDate: Fri Mar 13 16:09:40 2026 +0000 avcodec/lcevctab: Properly deduplicate ff_lcevc_resolution_type (Currently lcevctab.o does not export anything.) Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/Makefile | 2 +- libavcodec/lcevctab.c | 16 ++++++++++++++++ libavcodec/lcevctab.h | 20 ++++---------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1410bd8142..1f6c20a09b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -130,7 +130,7 @@ OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o OBJS-$(CONFIG_JNI) += ffjni.o jni.o OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o OBJS-$(CONFIG_LCMS2) += fflcms2.o -OBJS-$(CONFIG_LIBLCEVC_DEC) += lcevcdec.o +OBJS-$(CONFIG_LIBLCEVC_DEC) += lcevcdec.o lcevctab.o OBJS-$(CONFIG_LLAUDDSP) += lossless_audiodsp.o OBJS-$(CONFIG_LLVIDDSP) += lossless_videodsp.o OBJS-$(CONFIG_LLVIDENCDSP) += lossless_videoencdsp.o diff --git a/libavcodec/lcevctab.c b/libavcodec/lcevctab.c index 76853b80e5..045fc718e4 100644 --- a/libavcodec/lcevctab.c +++ b/libavcodec/lcevctab.c @@ -17,3 +17,19 @@ */ #include "lcevctab.h" + +const struct FFLCEVCDim ff_lcevc_resolution_type[63] = { + { 0, 0}, + { 360, 200 }, { 400, 240 }, { 480, 320 }, { 640, 360 }, + { 640, 480 }, { 768, 480 }, { 800, 600 }, { 852, 480 }, + { 854, 480 }, { 856, 480 }, { 960, 540 }, { 960, 640 }, + { 1024, 576 }, { 1024, 600 }, { 1024, 768 }, { 1152, 864 }, + { 1280, 720 }, { 1280, 800 }, { 1280, 1024 }, { 1360, 768 }, + { 1366, 768 }, { 1920, 1200 }, { 2048, 1080 }, { 2048, 1152 }, + { 2048, 1536 }, { 2160, 1440 }, { 2560, 1440 }, { 2560, 1600 }, + { 2560, 2048 }, { 3200, 1800 }, { 3200, 2048 }, { 3200, 2400 }, + { 3440, 1440 }, { 3840, 1600 }, { 3840, 2160 }, { 3840, 2400 }, + { 4096, 2160 }, { 4096, 3072 }, { 5120, 2880 }, { 5120, 3200 }, + { 5120, 4096 }, { 6400, 4096 }, { 6400, 4800 }, { 7680, 4320 }, + { 7680, 4800 }, +}; diff --git a/libavcodec/lcevctab.h b/libavcodec/lcevctab.h index 6803589531..89361cebe9 100644 --- a/libavcodec/lcevctab.h +++ b/libavcodec/lcevctab.h @@ -19,23 +19,11 @@ #ifndef AVCODEC_LCEVCTAB_H #define AVCODEC_LCEVCTAB_H -static const struct { +#include "libavutil/attributes_internal.h" + +EXTERN const struct FFLCEVCDim { int width; int height; -} ff_lcevc_resolution_type[63] = { - { 0, 0}, - { 360, 200 }, { 400, 240 }, { 480, 320 }, { 640, 360 }, - { 640, 480 }, { 768, 480 }, { 800, 600 }, { 852, 480 }, - { 854, 480 }, { 856, 480 }, { 960, 540 }, { 960, 640 }, - { 1024, 576 }, { 1024, 600 }, { 1024, 768 }, { 1152, 864 }, - { 1280, 720 }, { 1280, 800 }, { 1280, 1024 }, { 1360, 768 }, - { 1366, 768 }, { 1920, 1200 }, { 2048, 1080 }, { 2048, 1152 }, - { 2048, 1536 }, { 2160, 1440 }, { 2560, 1440 }, { 2560, 1600 }, - { 2560, 2048 }, { 3200, 1800 }, { 3200, 2048 }, { 3200, 2400 }, - { 3440, 1440 }, { 3840, 1600 }, { 3840, 2160 }, { 3840, 2400 }, - { 4096, 2160 }, { 4096, 3072 }, { 5120, 2880 }, { 5120, 3200 }, - { 5120, 4096 }, { 6400, 4096 }, { 6400, 4800 }, { 7680, 4320 }, - { 7680, 4800 }, -}; +} ff_lcevc_resolution_type[63]; #endif /* AVCODEC_LCEVCTAB_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
