summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Ralph <tralph@mythtv.org>2011-05-11 13:17:39 (GMT)
committer Taylor Ralph <tralph@mythtv.org>2011-05-11 13:17:39 (GMT)
commit50322869c8bd2ccfdacfabfe916ef52b8566cd23 (patch)
tree1317bcc7a7ebe4bfe64404886684b8276e0bce8d
parent32882b2fdd91883826dcc3a15ce32ae67e7aa9c8 (diff)
Revert "VideoBuffers: Remove some unused code."
This reverts commit 32882b2fdd91883826dcc3a15ce32ae67e7aa9c8.
-rw-r--r--mythtv/libs/libmythtv/videobuffers.cpp4
-rw-r--r--mythtv/libs/libmythtv/videobuffers.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/mythtv/libs/libmythtv/videobuffers.cpp b/mythtv/libs/libmythtv/videobuffers.cpp
index 4442c76..b3f793e 100644
--- a/mythtv/libs/libmythtv/videobuffers.cpp
+++ b/mythtv/libs/libmythtv/videobuffers.cpp
@@ -1304,6 +1304,10 @@ void VideoBuffers::DeleteBuffers()
}
}
+ for (uint i = 0; i < allocated_structs.size(); i++)
+ delete allocated_structs[i];
+ allocated_structs.clear();
+
for (uint i = 0; i < allocated_arrays.size(); i++)
av_free(allocated_arrays[i]);
allocated_arrays.clear();
diff --git a/mythtv/libs/libmythtv/videobuffers.h b/mythtv/libs/libmythtv/videobuffers.h
index 6c751a2..43f1eb3 100644
--- a/mythtv/libs/libmythtv/videobuffers.h
+++ b/mythtv/libs/libmythtv/videobuffers.h
@@ -171,6 +171,7 @@ class VideoBuffers
frame_queue_t available, used, limbo, pause, displayed, decode, finished;
vbuffer_map_t vbufferMap; // videobuffers to buffer's index
frame_vector_t buffers;
+ uchar_vector_t allocated_structs; // for DeleteBuffers
uchar_vector_t allocated_arrays; // for DeleteBuffers
frame_map_t parents; // prev & future frames
frame_map_t children; // frames that depend on a parent frame