From c7ad555eae0226e9e8556430e48b89e74f45e8d1 Mon Sep 17 00:00:00 2001 From: kc5nra Date: Tue, 24 Mar 2015 00:16:35 -0500 Subject: [PATCH] obs-ffmpeg: Handle null frames in frame callbacks This is in preparation of an API change that will send null frames to signal the end of the media being played. --- plugins/obs-ffmpeg/obs-ffmpeg-source.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-source.c b/plugins/obs-ffmpeg/obs-ffmpeg-source.c index c1a50c6a5..18a027260 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-source.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-source.c @@ -247,6 +247,10 @@ static bool video_frame(struct ff_frame *frame, void *opaque) double d_pts; uint64_t pts; + if (frame == NULL) { + return true; + } + d_pts = ff_get_sync_clock(&s->demuxer->clock) - frame->pts; pts = os_gettime_ns() - (uint64_t)(d_pts * 1000000000.0L); @@ -274,6 +278,9 @@ static bool audio_frame(struct ff_frame *frame, void *opaque) double d_pts; uint64_t pts; + if (frame == NULL) + return true; + d_pts = ff_get_sync_clock(&s->demuxer->clock) - frame->pts; pts = os_gettime_ns() - (uint64_t)(d_pts * 1000000000.0L);