[FFmpeg-cvslog] proresdec: rename to avoid confusion

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 14 21:45:14 2011 +0200| [4b9e9a57eeadf1ece872b19a433b3c004aaa5e46] | committer: Michael Niedermayer

proresdec: rename to avoid confusion

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b9e9a57eeadf1ece872b19a433b3c004aaa5e46
---

 libavcodec/Makefile                      |    2 +-
 libavcodec/{proresdec.c => proresdec2.c} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)

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