virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg_mux: fix reporting muxer EOF as error

Browse Source 
Fix #10327.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2023-04-22 20:56:34 +08:00
parent 7ecf1bff6d
commit b56aca9b42
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fftools/ffmpeg_mux.c
View File

@@ -214,9 +214,15 @@ static void *muxer_thread(void *arg)
ost = of->streams[stream_idx]; ost = of->streams[stream_idx];
ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof); ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof);
av_packet_unref(pkt); av_packet_unref(pkt);
if (ret == AVERROR_EOF && stream_eof) if (ret == AVERROR_EOF) {
tq_receive_finish(mux->tq, stream_idx); if (stream_eof) {
else if (ret < 0) { tq_receive_finish(mux->tq, stream_idx);
} else {
av_log(mux, AV_LOG_VERBOSE, "Muxer returned EOF\n");
ret = 0;
break;
}
} else if (ret < 0) {
av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n"); av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n");
break; break;
} }