aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Bradshaw <mbradshaw@sorensonmedia.com>2011-11-17 15:39:16 +0100
committerLuca Barbato <lu_zero@gentoo.org>2012-07-17 14:56:22 +0200
commitb43a7bb4f91aa9f6eeb630b625f4cf6f47b335cc (patch)
tree753aecdda601cea09cc163ef51763e2dc501515e /libavcodec
parent86991ce2dde3358025be134b4c7939923cd81542 (diff)
downloadffmpeg-b43a7bb4f91aa9f6eeb630b625f4cf6f47b335cc.tar.gz
libopenjpeg: rename decoder source file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/libopenjpegdec.c (renamed from libavcodec/libopenjpeg.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 81cce1d4c7..fad050e7e6 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -611,7 +611,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o \
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o
-OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o
+OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o
OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \
libschroedinger.o
OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o \
diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpegdec.c
index 799ccd7745..799ccd7745 100644
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpegdec.c