diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2007-01-31 22:58:53 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2007-01-31 22:58:53 +0000 |
| commit | 4302963daa0912e35c7d7f53a1d9d34099f7a749 (patch) | |
| tree | 31bcf5c35f5bccb26f344dddd31439645e6bddd9 | |
| parent | c215e403167dc33cbad38a8adb6cf8aa0ff69c94 (diff) | |
| download | ffmpeg-4302963daa0912e35c7d7f53a1d9d34099f7a749.tar.gz | |
Move lzo decompression to libavutil
Originally committed as revision 7789 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavutil/Makefile | 3 | ||||
| -rw-r--r-- | libavutil/avutil.h | 4 | ||||
| -rw-r--r-- | libavutil/lzo.c (renamed from libavcodec/lzo.c) | 0 | ||||
| -rw-r--r-- | libavutil/lzo.h (renamed from libavcodec/lzo.h) | 0 |
5 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1bdda6a02c..0b8c724baf 100644 --- 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 ab0db8f9b1..1e626fa5a3 100644 --- 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 d5a4570dca..d85755cd8b 100644 --- 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 index d3849a743d..d3849a743d 100644 --- a/libavcodec/lzo.c +++ b/libavutil/lzo.c diff --git a/libavcodec/lzo.h b/libavutil/lzo.h index 5b3d98f408..5b3d98f408 100644 --- a/libavcodec/lzo.h +++ b/libavutil/lzo.h |