summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-01-11 16:38:13 +0100
committerCarl Hetherington <cth@carlh.net>2022-01-11 16:38:13 +0100
commit3b3ab3a69bc35f30690c9e5a5703baf3c700e41b (patch)
tree9d0441b906f83d86ea354217ecf672228c5c1436 /src/lib/ffmpeg_decoder.cc
parent32925ee291446cfba8bbd35828ba1719373edb40 (diff)
Cleanup: move some stuff into process_video_frame().
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 6c863f3b4..0c9f1de6e 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -548,6 +548,15 @@ FFmpegDecoder::decode_and_process_video_packet (AVPacket* packet)
throw DecodeError (N_("avcodec_receive_frame"), N_("FFmpeg::decode_and_process_video_packet"), r);
}
+ process_video_frame ();
+
+ return true;
+}
+
+
+void
+FFmpegDecoder::process_video_frame ()
+{
/* We assume we'll only get one frame here, which I think is safe */
boost::mutex::scoped_lock lm (_filter_graphs_mutex);
@@ -587,8 +596,6 @@ FFmpegDecoder::decode_and_process_video_packet (AVPacket* packet)
LOG_WARNING_NC ("Dropping frame without PTS");
}
}
-
- return true;
}