From 4b9e9a57eeadf1ece872b19a433b3c004aaa5e46 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 14 Oct 2011 21:45:14 +0200 Subject: [PATCH] proresdec: rename to avoid confusion Signed-off-by: Michael Niedermayer --- libavcodec/Makefile | 2 +- libavcodec/{proresdec.c => proresdec2.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename libavcodec/{proresdec.c => proresdec2.c} (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c0397a8c71..97edaeec1e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -313,7 +313,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o -OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o +OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o OBJS-$(CONFIG_PRORES_LGPL_DECODER) += proresdec_lgpl.o proresdsp.o OBJS-$(CONFIG_PTX_DECODER) += ptx.o OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \ diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec2.c similarity index 100% rename from libavcodec/proresdec.c rename to libavcodec/proresdec2.c