Pārlūkot izejas kodu

ffmpeg-mux: Do not output error if non-fatal error

Fixes a case where stderr can fill up and cause a freeze on Windows
Jim 3 gadi atpakaļ
vecāks
revīzija
9b087d15fc
1 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. 5 5
      plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c

+ 5 - 5
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c

@@ -1159,16 +1159,16 @@ static inline bool ffmpeg_mux_packet(struct ffmpeg_mux *ffm, uint8_t *buf,
 
 	int ret = av_interleaved_write_frame(ffm->output, ffm->packet);
 
-	if (ret < 0) {
-		fprintf(stderr, "av_interleaved_write_frame failed: %d: %s\n",
-			ret, av_err2str(ret));
-	}
-
 	/* Treat "Invalid data found when processing input" and "Invalid argument" as non-fatal */
 	if (ret == AVERROR_INVALIDDATA || ret == -EINVAL) {
 		return true;
 	}
 
+	if (ret < 0) {
+		fprintf(stderr, "av_interleaved_write_frame failed: %d: %s\n",
+			ret, av_err2str(ret));
+	}
+
 	return ret >= 0;
 }