RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_demux: factorize signalling end of demuxing

This commit is contained in:
Anton Khirnov 2022-03-22 17:56:30 +01:00
parent aae9de0cb2
commit de9fb9fba7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fftools/ffmpeg_demux.c
View File

@ -18,6 +18,7 @@
#include "ffmpeg.h"
#include "libavutil/avassert.h"
#include "libavutil/error.h"
#include "libavutil/time.h"
#include "libavutil/timestamp.h"
@ -142,7 +143,6 @@ static void *input_thread(void *arg)
/* fallthrough to the error path */
}
av_thread_message_queue_set_err_recv(f->in_thread_queue, ret);
break;
}
@ -162,7 +162,7 @@ static void *input_thread(void *arg)
msg.pkt = av_packet_alloc();
if (!msg.pkt) {
av_packet_unref(pkt);
av_thread_message_queue_set_err_recv(f->in_thread_queue, AVERROR(ENOMEM));
ret = AVERROR(ENOMEM);
break;
}
av_packet_move_ref(msg.pkt, pkt);
@ -181,11 +181,13 @@ static void *input_thread(void *arg)
"Unable to send packet to main thread: %s\n",
av_err2str(ret));
av_packet_free(&msg.pkt);
av_thread_message_queue_set_err_recv(f->in_thread_queue, ret);
break;
}
}
av_assert0(ret < 0);
av_thread_message_queue_set_err_recv(f->in_thread_queue, ret);
return NULL;
}