Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matroska reader: don't buffer more than 128 MB for audio/video tracks

Browse Source 
Fixes #2304.
This commit is contained in:
Moritz Bunkus 2018-05-14 14:49:46 +02:00
parent 0b9b1228a3
commit 54e9f3b3de
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.md
View File

@ -18,6 +18,9 @@
regular sub-expressions for ISO 639-1 codes could match on empty strings,
too, causing matches in wrong places and hence no language being recognized
in certain situations. Fixes #2298.
* mkvmerge: Matroska reader: fixed mkvmerge buffering the whole file if a
video track is multiplexed that consists of only one or a few frames. Fixes
#2304.
# Version 23.0.0 "The Bride Said No" 2018-05-02

2
src/input/r_matroska.cpp
View File

@ -2233,7 +2233,7 @@ kax_reader_c::read(generic_packetizer_c *requested_ptzr,
auto requested_ptzr_track = m_ptzr_to_track_map[requested_ptzr];
if ( !requested_ptzr_track
|| (!force && ('a' != requested_ptzr_track->type) && ('v' != requested_ptzr_track->type))
|| ( force && (128 * 1024 * 1024 >= num_queued_bytes)))
|| (128 * 1024 * 1024 < num_queued_bytes))
return FILE_STATUS_HOLDING;
}