diff --git a/ChangeLog b/ChangeLog index 5d9af39e9..67fd30e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-12-15 Moritz Bunkus + + * mkvmerge: Fixed negative audio displacement for a couple of + formats. + +2004-12-13 Moritz Bunkus + + * Released v1.0.1. + 2004-12-11 Moritz Bunkus * mmg: Fixed some layout issues with wxWidgets 2.5.3 and newer. diff --git a/src/output/p_aac.cpp b/src/output/p_aac.cpp index 9e3037288..ef97171ae 100644 --- a/src/output/p_aac.cpp +++ b/src/output/p_aac.cpp @@ -79,7 +79,7 @@ aac_packetizer_c::get_aac_packet(unsigned long *header, displace(-pins); byte_buffer.remove(pos + aacheader->bytes); - return NULL; + return get_aac_packet(header, aacheader); } if (verbose && (pos > 0)) diff --git a/src/output/p_ac3.cpp b/src/output/p_ac3.cpp index a80b0dcd3..16195ae77 100644 --- a/src/output/p_ac3.cpp +++ b/src/output/p_ac3.cpp @@ -108,7 +108,7 @@ ac3_packetizer_c::get_ac3_packet(unsigned long *header, displace(-pins); byte_buffer.remove(ac3header->bytes); - return NULL; + return get_ac3_packet(header, ac3header); } buf = (unsigned char *)safememdup(packet_buffer, ac3header->bytes); diff --git a/src/output/p_dts.cpp b/src/output/p_dts.cpp index 9358e198d..bf13de15b 100644 --- a/src/output/p_dts.cpp +++ b/src/output/p_dts.cpp @@ -135,7 +135,7 @@ dts_packetizer_c::get_dts_packet(dts_header_t &dtsheader) { displace(-pins); remove_dts_packet(pos, dtsheader.frame_byte_size); - return 0; + return get_dts_packet(dtsheader); } if (verbose && (pos > 0) && !skipping_is_normal) diff --git a/src/output/p_mp3.cpp b/src/output/p_mp3.cpp index 3753166e8..aded87612 100644 --- a/src/output/p_mp3.cpp +++ b/src/output/p_mp3.cpp @@ -153,7 +153,7 @@ mp3_packetizer_c::get_mp3_packet(mp3_header_t *mp3header) { displace(-pins); byte_buffer.remove(mp3header->framesize); - return NULL; + return get_mp3_packet(mp3header); } buf = (unsigned char *)safememdup(byte_buffer.get_buffer(),