Skip to content

Commit 03e50bc

Browse files
committed
libmatroska2: replace libavutil lzo with lzokay
This is a version of lzokay without the compression part and ported to C. Based on AxioDL/lzokay@671e2b9 Originally found in https://github.com/jackoalan/lzokay.git It's MIT licensed so more friendly than the LGPL 2.1+ of libavutil.
1 parent 10de318 commit 03e50bc

File tree

11 files changed

+362
-341
lines changed

11 files changed

+362
-341
lines changed

libmatroska2/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ if (CONFIG_ZLIB)
6161
endif(CONFIG_ZLIB)
6262

6363
if (CONFIG_LZO1X)
64-
add_subdirectory("lavu_lzo")
65-
target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:lavu_lzo>)
64+
add_subdirectory("lzokay")
65+
target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:lzokay>)
6666
endif(CONFIG_LZO1X)
6767

6868
if (CONFIG_BZLIB)

libmatroska2/lavu_lzo/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

libmatroska2/lavu_lzo/lzo.c

Lines changed: 0 additions & 248 deletions
This file was deleted.

libmatroska2/lavu_lzo/lzo.h

Lines changed: 0 additions & 67 deletions
This file was deleted.

libmatroska2/lzokay/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# lzokay library API ported to C only containing the decompressor
2+
3+
add_library("lzokay" STATIC)
4+
set(LZOKAY_GROUP_PUBLIC_HEADERS
5+
lzokay.h
6+
)
7+
set(LZOKAY_GROUP_SOURCES lzokay.c)
8+
9+
target_sources("lzokay" PRIVATE ${LZOKAY_GROUP_SOURCES} ${LZOKAY_GROUP_PUBLIC_HEADERS})
10+
target_include_directories("lzokay" PUBLIC ".")
11+
set_target_properties("lzokay" PROPERTIES
12+
PUBLIC_HEADER "${LZOKAY_GROUP_PUBLIC_HEADERS}"
13+
)

0 commit comments

Comments
 (0)