[Ffmpeg-cvslog] r7789 - in trunk: libavcodec/Makefile libavcodec/lzo.c libavcodec/lzo.h libavutil/Makefile libavutil/avutil.h libavutil/lzo.c libavutil/lzo.h

[reimar]

Author: reimar
Date: Wed Jan 31 23:58:53 2007
New Revision: 7789

Added:
   trunk/libavutil/lzo.c
      - copied unchanged from r7788, /trunk/libavcodec/lzo.c
   trunk/libavutil/lzo.h
      - copied unchanged from r7788, /trunk/libavcodec/lzo.h
Removed:
   trunk/libavcodec/lzo.c
   trunk/libavcodec/lzo.h
Modified:
   trunk/libavcodec/Makefile
   trunk/libavutil/Makefile
   trunk/libavutil/avutil.h

Log:
Move lzo decompression to libavutil


Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Wed Jan 31 23:58:53 2007
@@ -60,7 +60,7 @@
 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_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

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Wed Jan 31 23:58:53 2007
@@ -16,9 +16,10 @@
       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)

Modified: trunk/libavutil/avutil.h
==============================================================================
--- trunk/libavutil/avutil.h	(original)
+++ trunk/libavutil/avutil.h	Wed Jan 31 23:58:53 2007
@@ -34,8 +34,8 @@
 #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)