From b65d616d5e187ca2153f5f9390dd8ad16d7da30e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Oct 2022 23:37:50 +0200 Subject: Remove believed-unnecessary mutex. --- src/lib/ffmpeg_decoder.cc | 13 ++++--------- src/lib/ffmpeg_decoder.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index a5b36d04f..986e51ab6 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -401,13 +401,10 @@ FFmpegDecoder::seek (ContentTime time, bool accurate) AVSEEK_FLAG_BACKWARD ); - { - /* Force re-creation of filter graphs to reset them and hence to make sure - they don't have any pre-seek frames knocking about. - */ - boost::mutex::scoped_lock lm (_filter_graphs_mutex); - _filter_graphs.clear (); - } + /* Force re-creation of filter graphs to reset them and hence to make sure + they don't have any pre-seek frames knocking about. + */ + _filter_graphs.clear(); if (video_codec_context ()) { avcodec_flush_buffers (video_codec_context()); @@ -580,8 +577,6 @@ FFmpegDecoder::decode_and_process_video_packet (AVPacket* packet) void FFmpegDecoder::process_video_frame () { - boost::mutex::scoped_lock lm (_filter_graphs_mutex); - shared_ptr graph; auto i = _filter_graphs.begin(); diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index e1a023453..c6d76f1e8 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -77,7 +77,6 @@ private: void maybe_add_subtitle (); std::list> _filter_graphs; - boost::mutex _filter_graphs_mutex; dcpomatic::ContentTime _pts_offset; boost::optional _current_subtitle_to; -- cgit v1.2.3