[FFmpeg-devel] [PATCH] avcodec/proresdec2: Rename to proresdec

[FFmpeg-devel] [PATCH] avcodec/proresdec2: Rename to proresdec

[Andreas Rheinhardt]

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>
---
 libavcodec/Makefile                      | 2 +-
 libavcodec/{proresdec2.c => proresdec.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename libavcodec/{proresdec2.c => proresdec.c} (100%)

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
similarity index 100%
rename from libavcodec/proresdec2.c
rename to libavcodec/proresdec.c
-- 
2.40.1

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] avcodec/proresdec2: Rename to proresdec

[Andreas Rheinhardt]

Andreas Rheinhardt:
> 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>
> ---
>  libavcodec/Makefile                      | 2 +-
>  libavcodec/{proresdec2.c => proresdec.c} | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename libavcodec/{proresdec2.c => proresdec.c} (100%)
> 
> 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
> similarity index 100%
> rename from libavcodec/proresdec2.c
> rename to libavcodec/proresdec.c

Will apply tomorrow unless there are objections.

- 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".