From e5c68399049a0a7d84a33febaa75a68ced2ef9f9 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Mon, 21 Dec 2020 18:36:10 +0100 Subject: [PATCH] libobs, obs-ffmpeg: Use correct value for EINVAL error check FFmpeg functions such as av_interleaved_write_frame return negative on error, so all errno values are negated. --- libobs/media-io/media-remux.c | 2 +- plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c index 94a57bd86..673aff3d4 100644 --- a/libobs/media-io/media-remux.c +++ b/libobs/media-io/media-remux.c @@ -227,7 +227,7 @@ static inline int process_packets(media_remux_job_t job, /* Treat "Invalid data found when processing input" and * "Invalid argument" as non-fatal */ - if (ret == AVERROR_INVALIDDATA || ret == EINVAL) + if (ret == AVERROR_INVALIDDATA || ret == -EINVAL) continue; break; diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c index debe64640..368877e60 100644 --- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c @@ -808,7 +808,7 @@ static inline bool ffmpeg_mux_packet(struct ffmpeg_mux *ffm, uint8_t *buf, } /* Treat "Invalid data found when processing input" and "Invalid argument" as non-fatal */ - if (ret == AVERROR_INVALIDDATA || ret == EINVAL) { + if (ret == AVERROR_INVALIDDATA || ret == -EINVAL) { return true; }