Commit be23d686 authored by Steve Lhomme's avatar Steve Lhomme

mkclean: fix the recompression of the CodecPrivate through successive mkclean calls

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@791 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent d47ed003
2011-08-15
version 0.8.5:
- fix the recompression of the CodecPrivate through successive mkclean calls
2011-07-10 2011-07-10
version 0.8.4: version 0.8.4:
- fix the keyframe detection for WebM alt-ref frames (0 duration = non keyframe) - fix the keyframe detection for WebM alt-ref frames (0 duration = non keyframe)
......
...@@ -2649,9 +2649,22 @@ int main(int argc, const char *argv[]) ...@@ -2649,9 +2649,22 @@ int main(int argc, const char *argv[])
} }
if (encoding == MATROSKA_BLOCK_COMPR_NONE) if (encoding == MATROSKA_BLOCK_COMPR_NONE)
zlib_scope = 0; zlib_scope = 0;
else
{
if (Encodings)
{
Elt = EBML_MasterFindChild((ebml_master*)Encodings,&MATROSKA_ContextContentEncoding);
if (Elt)
{
Elt2 = EBML_MasterGetChild((ebml_master*)Elt,&MATROSKA_ContextContentEncodingScope);
if (Elt2)
zlib_scope = EBML_IntegerValue((ebml_integer*)Elt2);
}
}
}
// see if we can add CodecPrivate too // see if we can add CodecPrivate too
if ((Optimize || encoding != MATROSKA_BLOCK_COMPR_NONE) && encoding != MATROSKA_BLOCK_COMPR_HEADER) if ((Optimize || encoding != MATROSKA_BLOCK_COMPR_NONE) && encoding != MATROSKA_BLOCK_COMPR_HEADER && zlib_scope != MATROSKA_COMPR_SCOPE_PRIVATE)
{ {
if (CodecPrivate!=NULL) if (CodecPrivate!=NULL)
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
GROUP mkclean_base GROUP mkclean_base
{ {
PROJECT_NAME "mkclean" PROJECT_NAME "mkclean"
PROJECT_VERSION 0.8.4 PROJECT_VERSION 0.8.5
PROJECT_VENDOR "Matroska" PROJECT_VENDOR "Matroska"
USE matroska2 USE matroska2
IF !CONFIG_EBML_UNICODE IF !CONFIG_EBML_UNICODE
......
2011-08-14 2011-08-15
version 0.3.6: version 0.3.6:
- verify that the audio sampling freq is not 0 - verify that the audio sampling freq is not 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment