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

lavfi: reindent after previous commit.

Browse Source
This commit is contained in:
Nicolas George
2017-01-12 13:36:02 +01:00
parent 912969a33e
commit aaae459a85
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/avfilter.c
View File

@@ -1112,10 +1112,9 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame)
ff_inlink_process_commands(link, frame); ff_inlink_process_commands(link, frame);
dstctx->is_disabled = !ff_inlink_evaluate_timeline_at_frame(link, frame); dstctx->is_disabled = !ff_inlink_evaluate_timeline_at_frame(link, frame);
/* TODO reindent */ if (dstctx->is_disabled &&
if (dstctx->is_disabled && (dstctx->filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC))
(dstctx->filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC)) filter_frame = default_filter_frame;
filter_frame = default_filter_frame;
ret = filter_frame(link, frame); ret = filter_frame(link, frame);
link->frame_count_out++; link->frame_count_out++;
return ret; return ret;