4 files changed, 0 insertions, 43 deletions
diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h
index 7b7fbb11..3a85168f 100644
--- a/src/liblzma/common/common.h
+++ b/src/liblzma/common/common.h
@@ -60,12 +60,6 @@
 #define LZMA_FILTER_RESERVED_START (LZMA_VLI_C(1) << 62)
 
 
-/// Internal helper filter used by Subblock decoder. It is mapped to an
-/// otherwise invalid Filter ID, which is impossible to get from any input
-/// file (even if malicious file).
-#define LZMA_FILTER_SUBBLOCK_HELPER LZMA_VLI_C(0x7000000000000001)
-
-
 /// Supported flags that can be passed to lzma_stream_decoder()
 /// or lzma_auto_decoder().
 #define LZMA_SUPPORTED_FLAGS \
diff --git a/src/liblzma/common/filter_common.c b/src/liblzma/common/filter_common.c
index 2322d7de..b157c628 100644
--- a/src/liblzma/common/filter_common.c
+++ b/src/liblzma/common/filter_common.c
@@ -52,15 +52,6 @@ static const struct {
 		.changes_size = true,
 	},
 #endif
-#if defined(HAVE_ENCODER_SUBBLOCK) || defined(HAVE_DECODER_SUBBLOCK)
-	{
-		.id = LZMA_FILTER_SUBBLOCK,
-		.options_size = sizeof(lzma_options_subblock),
-		.non_last_ok = true,
-		.last_ok = true,
-		.changes_size = true,
-	},
-#endif
 #ifdef HAVE_DECODER_X86
 	{
 		.id = LZMA_FILTER_X86,
diff --git a/src/liblzma/common/filter_decoder.c b/src/liblzma/common/filter_decoder.c
index 95f77b76..1ebbe2af 100644
--- a/src/liblzma/common/filter_decoder.c
+++ b/src/liblzma/common/filter_decoder.c
@@ -14,8 +14,6 @@
 #include "filter_common.h"
 #include "lzma_decoder.h"
 #include "lzma2_decoder.h"
-#include "subblock_decoder.h"
-#include "subblock_decoder_helper.h"
 #include "simple_decoder.h"
 #include "delta_decoder.h"
 
@@ -60,20 +58,6 @@ static const lzma_filter_decoder decoders[] = {
 		.props_decode = &lzma_lzma2_props_decode,
 	},
 #endif
-#ifdef HAVE_DECODER_SUBBLOCK
-	{
-		.id = LZMA_FILTER_SUBBLOCK,
-		.init = &lzma_subblock_decoder_init,
-// 		.memusage = &lzma_subblock_decoder_memusage,
-		.props_decode = NULL,
-	},
-	{
-		.id = LZMA_FILTER_SUBBLOCK_HELPER,
-		.init = &lzma_subblock_decoder_helper_init,
-		.memusage = NULL,
-		.props_decode = NULL,
-	},
-#endif
 #ifdef HAVE_DECODER_X86
 	{
 		.id = LZMA_FILTER_X86,
diff --git a/src/liblzma/common/filter_encoder.c b/src/liblzma/common/filter_encoder.c
index ab3d3af1..436d2cc6 100644
--- a/src/liblzma/common/filter_encoder.c
+++ b/src/liblzma/common/filter_encoder.c
@@ -14,7 +14,6 @@
 #include "filter_common.h"
 #include "lzma_encoder.h"
 #include "lzma2_encoder.h"
-#include "subblock_encoder.h"
 #include "simple_encoder.h"
 #include "delta_encoder.h"
 
@@ -77,17 +76,6 @@ static const lzma_filter_encoder encoders[] = {
 		.props_encode = &lzma_lzma2_props_encode,
 	},
 #endif
-#ifdef HAVE_ENCODER_SUBBLOCK
-	{
-		.id = LZMA_FILTER_SUBBLOCK,
-		.init = &lzma_subblock_encoder_init,
-// 		.memusage = &lzma_subblock_encoder_memusage,
-		.chunk_size = NULL,
-		.props_size_get = NULL,
-		.props_size_fixed = 0,
-		.props_encode = NULL,
-	},
-#endif
 #ifdef HAVE_ENCODER_X86
 	{
 		.id = LZMA_FILTER_X86,