Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not re-render the track headers for tracks that are appended to other tracks.

Browse Source 
Fix for bug 427.
This commit is contained in:
Moritz Bunkus 2009-07-13 20:04:43 +02:00
parent d179c80a8e
commit ed60a04c08
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-07-13 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Appending MPEG4 part 2 video tracks from
Matroska files which contain aspect ratio information will not
result in an error message "connected_to > 0" anymore. Fix for bug
427.
2009-07-06 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Fixed the audio sync for tracks read from AVI

7
src/output/p_mpeg4_p2.cpp
View File

@ -326,7 +326,7 @@ mpeg4_p2_video_packetizer_c::extract_aspect_ratio(const unsigned char *buffer,
if (m_aspect_ratio_extracted)
return;
if (ti.aspect_ratio_given || ti.display_dimensions_given) {
if ((0 != connected_to) || ti.aspect_ratio_given || ti.display_dimensions_given) {
m_aspect_ratio_extracted = true;
return;
}
@ -353,6 +353,11 @@ mpeg4_p2_video_packetizer_c::extract_size(const unsigned char *buffer,
if (m_size_extracted)
return;
if (0 != connected_to) {
m_size_extracted = true;
return;
}
uint32_t xtr_width, xtr_height;
if (mpeg4::p2::extract_size(buffer, size, xtr_width, xtr_height)) {