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

I/P frames were freed to early after a cluster has been rendered resulting in unresolvable brefs.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-04-16 10:53:18 +00:00
parent c1d2c53d58
commit 9012ba609b
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-04-16 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: In rare occasions involving B frames mkvmerge
freed data too early. In such a case it was eating more and more
memory finally exiting with a message about not finding a packet
for a "bref".
2005-04-09 Moritz Bunkus <moritz@bunkus.org>
* all: bug fix: My output functions did not work on AMD64

6
src/merge/pr_generic.cpp
View File

@ -50,7 +50,8 @@ generic_packetizer_c::generic_packetizer_c(generic_reader_c *nreader,
reader = nreader;
track_entry = NULL;
free_refs = -1;
m_free_refs = -1;
m_next_free_refs = -1;
enqueued_bytes = 0;
safety_last_timecode = 0;
safety_last_duration = 0;
@ -1073,7 +1074,8 @@ generic_packetizer_c::handle_avi_audio_sync(int64_t num_bytes,
void
generic_packetizer_c::connect(generic_packetizer_c *src,
int64_t _append_timecode_offset) {
free_refs = src->free_refs;
m_free_refs = src->m_free_refs;
m_next_free_refs = src->m_next_free_refs;
track_entry = src->track_entry;
hserialno = src->hserialno;
htrack_type = src->htrack_type;

9
src/merge/pr_generic.h
View File

@ -447,7 +447,7 @@ protected:
deque<packet_t *> packet_queue, deferred_packets;
int64_t initial_displacement;
int64_t free_refs, enqueued_bytes;
int64_t m_free_refs, m_next_free_refs, enqueued_bytes;
int64_t safety_last_timecode, safety_last_duration;
KaxTrackEntry *track_entry;
@ -522,11 +522,12 @@ public:
return enqueued_bytes;
}
virtual void set_free_refs(int64_t nfree_refs) {
free_refs = nfree_refs;
virtual void set_free_refs(int64_t free_refs) {
m_free_refs = m_next_free_refs;
m_next_free_refs = free_refs;
}
virtual int64_t get_free_refs() {
return free_refs;
return m_free_refs;
}
virtual void set_headers();
virtual void fix_headers();