Fixes a regression introduced in 32c59a115d3cc757676b5384a5ea44b5a7a7b872, becoming effective in 912969a33e313c57c906e87a7e2367b78a2160f4. Fixes trimmed output of ffmpeg -f lavfi -i "sine=d=0.01" -f lavfi -i "sine=d=1" -filter_complex "[0:a]anull[a1];[1:a]anull[a2]" -map "[a1]" -f null none -map "[a2]" -f framecrc -
Showing the changes to libavfilter/avfiltergraph.c (1 of 1 file). Show all
Unified · Split
| @@ -1399,10 +1399,13 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph) · 1398 unmodified lines | ||
| 1399 | 1399 | oldest = graph->sink_links[0]; |
| 1400 | 1400 | if (oldest->dst->filter->activate) { |
| 1401 | 1401 | /* For now, buffersink is the only filter implementing activate. */ |
| 1402 | − return av_buffersink_get_frame_flags(oldest->dst, NULL, | |
| 1403 | − AV_BUFFERSINK_FLAG_PEEK); | |
| 1402 | + r = av_buffersink_get_frame_flags(oldest->dst, NULL, | |
| 1403 | + AV_BUFFERSINK_FLAG_PEEK); | |
| 1404 | + if (r != AVERROR_EOF) | |
| 1405 | + return r; | |
| 1406 | + } else { | |
| 1407 | + r = ff_request_frame(oldest); | |
| 1404 | 1408 | } |
| 1405 | − r = ff_request_frame(oldest); | |
| 1406 | 1409 | if (r != AVERROR_EOF) |
| 1407 | 1410 | break; |
| 1408 | 1411 | av_log(oldest->dst, AV_LOG_DEBUG, "EOF on sink link %s:%s.\n", |