You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	Move lzo decompression to libavutil
Originally committed as revision 7789 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user