RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 06:42:03 +00:00
Code Issues Releases Wiki Activity

vf_lavfi: distinguish real errors from other states

Browse Source 
Don't just hide real errors, should a filter return them.
This commit is contained in:
wm4 2014-04-28 19:50:32 +02:00
parent 42f65ce108
commit f39e4210f7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video/filter/vf_lavfi.c
View File

@ -30,6 +30,7 @@
#include <libavutil/rational.h>
#include <libavutil/pixdesc.h>
#include <libavutil/time.h>
#include <libavutil/error.h>
#include <libswscale/swscale.h>
#include <libavfilter/avfilter.h>
#include <libavfilter/avfiltergraph.h>
@ -298,13 +299,21 @@ static int filter_ext(struct vf_instance *vf, struct mp_image *mpi)
for (;;) {
frame = av_frame_alloc();
if (av_buffersink_get_frame(p->out, frame) < 0) {
int err = av_buffersink_get_frame(p->out, frame);
if (err == AVERROR(EAGAIN) || err == AVERROR_EOF) {
// Not an error situation - no more output buffers in queue.
// AVERROR_EOF means we shouldn't even give the filter more
// input, but we don't handle that.
av_frame_free(&frame);
break;
}
get_metadata_from_av_frame(vf,frame);
if (err < 0) {
av_frame_free(&frame);
MP_ERR(vf, "libavfilter error: %d\n", err);
return -1;
}
get_metadata_from_av_frame(vf, frame);
vf_add_output_frame(vf, av_to_mp(vf, frame));
}