projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e755db4
)
Speculative fix for crash when destroying AudioFilterGraph.
author
Carl Hetherington
<cth@carlh.net>
Fri, 27 Nov 2015 21:46:04 +0000
(21:46 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 27 Nov 2015 21:46:04 +0000
(21:46 +0000)
src/lib/audio_filter_graph.cc
patch
|
blob
|
history
diff --git
a/src/lib/audio_filter_graph.cc
b/src/lib/audio_filter_graph.cc
index 0035fb21357a7d3dec5fd63f21e369d2f7fe2bdc..fd2492d3b8960f9a0da48a350c40fa9fe281279b 100644
(file)
--- a/
src/lib/audio_filter_graph.cc
+++ b/
src/lib/audio_filter_graph.cc
@@
-40,9
+40,7
@@
AudioFilterGraph::AudioFilterGraph (int sample_rate, int64_t channel_layout)
AudioFilterGraph::~AudioFilterGraph()
{
- if (_in_frame) {
- av_frame_free (&_in_frame);
- }
+ av_frame_free (&_in_frame);
}
string
@@
-114,6
+112,10
@@
AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
int r = av_buffersrc_write_frame (_buffer_src_context, _in_frame);
delete[] _in_frame->extended_data;
+ /* Reset extended_data to its original value so that av_frame_free
+ does not try to free it.
+ */
+ _in_frame->extended_data = _in_frame->data;
if (r < 0) {
char buffer[256];