proresdec: rename to avoid confusion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c0397a8..97edaee 100644 (file)
--- 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