Move lzo decompression to libavutil

Originally committed as revision 7789 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1bdda6a02caf9b961bf1c7cc14342af35304c4d5..0b8c724baf0fe5c0226f92424223f6c65136f4bd 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -60,7 +60,7 @@ OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.o
 OBJS-$(CONFIG_CLJR_DECODER)            += cljr.o
 OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.o
 OBJS-$(CONFIG_COOK_DECODER)            += cook.o
-OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o lzo.o
+OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
 OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
 OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.o
 OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
@@ -106,7 +106,7 @@ OBJS-$(CONFIG_MPC7_DECODER)            += mpc.o
 OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o
 OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o
 OBJS-$(CONFIG_MSZH_DECODER)            += lcl.o
-OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o lzo.o
+OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o
 OBJS-$(CONFIG_PNG_DECODER)             += png.o
 OBJS-$(CONFIG_PNG_ENCODER)             += png.o
 OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.o

diff --git a/libavutil/Makefile b/libavutil/Makefile
index ab0db8f9b117e9683725a9dbab9d1a2ef448e472..1e626fa5a3640e6cd7a39195cc1c014c4b7176b0 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -16,9 +16,10 @@ OBJS= mathematics.o \
       mem.o \
       fifo.o \
       tree.o \
+      lzo.o \
 
 HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
-          intfloat_readwrite.h md5.h adler32.h log.h fifo.h
+          intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h
 
 NAME=avutil
 ifeq ($(BUILD_SHARED),yes)

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index d5a4570dcaabd6875823afddafbf34f9a25881f1..d85755cd8b1a3221dfd0ebd18d11a2c8e50e2ef6 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -34,8 +34,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVUTIL_VERSION_INT   ((49<<16)+(2<<8)+0)
-#define LIBAVUTIL_VERSION       49.2.0
+#define LIBAVUTIL_VERSION_INT   ((49<<16)+(3<<8)+0)
+#define LIBAVUTIL_VERSION       49.3.0
 #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
 
 #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)

diff --git a/libavcodec/lzo.c b/libavutil/lzo.c
similarity index 100%
rename from libavcodec/lzo.c
rename to libavutil/lzo.c

diff --git a/libavcodec/lzo.h b/libavutil/lzo.h
similarity index 100%
rename from libavcodec/lzo.h
rename to libavutil/lzo.h