aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-14 21:45:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-14 21:45:14 +0200
commit4b9e9a57eeadf1ece872b19a433b3c004aaa5e46 (patch)
tree461d367eb00f4e857736657e6e447cf3f94972e1
parent0f8d77199aeb76a0c65d6506d3104cba3514fd2a (diff)
downloadffmpeg-4b9e9a57eeadf1ece872b19a433b3c004aaa5e46.tar.gz
proresdec: rename to avoid confusion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/proresdec2.c (renamed from libavcodec/proresdec.c)0
2 files changed, 1 insertions, 1 deletions
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
index a96af4fa9f..a96af4fa9f 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec2.c