summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-30 05:31:35 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-04-03 19:10:30 +0200
commite123295cc8701564e2c710ee95520b2fee7b57c9 (patch)
tree5aedc8d07f1c4b275b63f0b3056b093fcb7891c0
parent07c734b2b2ffadf96f5e12fe7899b40ccd58a3f2 (diff)
avcodec/proresdec2: Rename to proresdec
Once upon a time, there used to be a LGPL and a GPL ProRes decoder in FFmpeg; the current decoder evolved from the second of these. But given that it is now the only ProRes decoder we have, it's file should simply be named proresdec.c (which also brings it in line with its header). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/proresdec.c (renamed from libavcodec/proresdec2.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index eef936944d..8c8c2ce659 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -608,7 +608,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o
-OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o proresdsp.o proresdata.o
+OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o proresdsp.o proresdata.o
OBJS-$(CONFIG_PRORES_ENCODER) += proresenc_anatoliy.o proresdata.o
OBJS-$(CONFIG_PRORES_AW_ENCODER) += proresenc_anatoliy.o proresdata.o
OBJS-$(CONFIG_PRORES_KS_ENCODER) += proresenc_kostya.o proresdata.o
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec.c
index 73fbd3458e..73fbd3458e 100644
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec.c