Skip to content

Commit

Permalink
mkclean: rename zlib_scope to compress_scope
Browse files Browse the repository at this point in the history
  • Loading branch information
robUx4 committed Dec 24, 2024
1 parent dc2ed97 commit 1690aee
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions mkclean/mkclean.c
Original file line number Diff line number Diff line change
Expand Up @@ -2637,7 +2637,7 @@ int main(int argc, const char *argv[])
if (EBML_ElementIsType((ebml_element*)RLevel1, MATROSKA_getContextTrackEntry()))
{
MatroskaTrackEncodingCompAlgo encoding = MATROSKA_TRACK_ENCODING_COMP_NONE;
MatroskaContentEncodingScope zlib_scope = MATROSKA_CONTENTENCODINGSCOPE_BLOCK;
MatroskaContentEncodingScope compress_scope = MATROSKA_CONTENTENCODINGSCOPE_BLOCK;

Elt2 = EBML_MasterFindChild(RLevel1,MATROSKA_getContextTrackNumber());
if (!Elt2) continue;
Expand Down Expand Up @@ -2690,7 +2690,7 @@ int main(int argc, const char *argv[])
}
}
if (encoding == MATROSKA_TRACK_ENCODING_COMP_NONE)
zlib_scope = 0;
compress_scope = 0;
else
{
if (Encodings)
Expand All @@ -2700,13 +2700,13 @@ int main(int argc, const char *argv[])
{
Elt2 = EBML_MasterGetChild((ebml_master*)Elt,MATROSKA_getContextContentEncodingScope(), DstProfile);
if (Elt2)
zlib_scope = EBML_IntegerValue((ebml_integer*)Elt2);
compress_scope = EBML_IntegerValue((ebml_integer*)Elt2);
}
}
}

// see if we can add CodecPrivate too
if ((Optimize || encoding != MATROSKA_TRACK_ENCODING_COMP_NONE) && encoding != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP && zlib_scope != MATROSKA_CONTENTENCODINGSCOPE_PRIVATE)
if ((Optimize || encoding != MATROSKA_TRACK_ENCODING_COMP_NONE) && encoding != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP && compress_scope != MATROSKA_CONTENTENCODINGSCOPE_PRIVATE)
{
if (CodecPrivate!=NULL)
{
Expand All @@ -2718,7 +2718,7 @@ int main(int argc, const char *argv[])
&& (CompressedSize + ExtraCompHeaderBytes) < origCompressedSize)
{
encoding = MATROSKA_TRACK_ENCODING_COMP_ZLIB;
zlib_scope |= MATROSKA_CONTENTENCODINGSCOPE_PRIVATE;
compress_scope |= MATROSKA_CONTENTENCODINGSCOPE_PRIVATE;
}
free(Compressed);
}
Expand All @@ -2729,7 +2729,7 @@ int main(int argc, const char *argv[])
case MATROSKA_TRACK_ENCODING_COMP_ZLIB:
case MATROSKA_TRACK_ENCODING_COMP_BZLIB: // transform bzlib into zlib
case MATROSKA_TRACK_ENCODING_COMP_LZO1X: // transform lzo1x into zlib
if (MATROSKA_TrackSetCompressionAlgo((matroska_trackentry*)RLevel1, zlib_scope,DstProfile, MATROSKA_TRACK_ENCODING_COMP_ZLIB))
if (MATROSKA_TrackSetCompressionAlgo((matroska_trackentry*)RLevel1, compress_scope,DstProfile, MATROSKA_TRACK_ENCODING_COMP_ZLIB))
ClustersNeedRead = 1;
break;
case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP:
Expand Down

0 comments on commit 1690aee

Please sign in to comment.