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

In header mode (for raw AAC files), the AAC packetizer would not work at all.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-12-03 17:25:54 +00:00
parent d1ba86b423
commit 079a9c4c15
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2003-12-03 Moritz Bunkus <moritz@bunkus.org> 2003-12-03 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: The AAC packetizer was not working if packets
were being read from a raw AAC file (it worked fine from MP4 and
Matroska files).
* mkvmerge: bug fix: Avoid deadlocks when parsing broken SPU * mkvmerge: bug fix: Avoid deadlocks when parsing broken SPU
packets from VobSubs. packets from VobSubs.

3
src/output/p_aac.cpp
View File

@ -64,11 +64,8 @@ unsigned char *aac_packetizer_c::get_aac_packet(unsigned long *header,
unsigned char *buf, *src, *packet_buffer; unsigned char *buf, *src, *packet_buffer;
double pims; double pims;
buf = NULL;
packet_buffer = byte_buffer.get_buffer(); packet_buffer = byte_buffer.get_buffer();
size = byte_buffer.get_size(); size = byte_buffer.get_size();
if (buf == NULL)
return NULL;
pos = find_aac_header(packet_buffer, size, aacheader, emphasis_present); pos = find_aac_header(packet_buffer, size, aacheader, emphasis_present);
if (pos < 0) if (pos < 0)
return NULL; return NULL;