diff options
| author | James Almer <jamrial@gmail.com> | 2022-02-26 12:28:44 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-02-26 14:22:07 -0300 |
| commit | df272928ff8041f87b92f4cf8dbf12a28fe9cdf7 (patch) | |
| tree | d58bf75faad3565f42701836cd1c2e81c583ad06 /libavformat/matroskadec.c | |
| parent | ff145498b25e20f0563c75bbb84d1513df634d4c (diff) | |
| download | ffmpeg-df272928ff8041f87b92f4cf8dbf12a28fe9cdf7.tar.gz | |
configure: stop allowing disabling lzo
The module is now always compiled in.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 974bc6f8e3..95e49cbe7f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1684,7 +1684,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, memcpy(pkt_data + header_size, data, isize); break; } -#if CONFIG_LZO case MATROSKA_TRACK_ENCODING_COMP_LZO: do { int insize = isize; @@ -1704,7 +1703,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, } pkt_size -= olen; break; -#endif #if CONFIG_ZLIB case MATROSKA_TRACK_ENCODING_COMP_ZLIB: { @@ -2527,9 +2525,7 @@ static int matroska_parse_tracks(AVFormatContext *s) #if CONFIG_BZLIB encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB && #endif -#if CONFIG_LZO encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && -#endif encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { encodings[0].scope = 0; av_log(matroska->ctx, AV_LOG_ERROR, |