ffmpeg | branch: master | Nicolas George <geo...@nsup.org> | Thu Jan 12 
13:36:02 2017 +0100| [aaae459a850ee367f5a0409a5f2ba8200a2b2fe5] | committer: 
Nicolas George

lavfi: reindent after previous commit.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aaae459a850ee367f5a0409a5f2ba8200a2b2fe5
---

 libavfilter/avfilter.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 91b483f..c12d491 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1112,10 +1112,9 @@ static int ff_filter_frame_framed(AVFilterLink *link, 
AVFrame *frame)
     ff_inlink_process_commands(link, frame);
     dstctx->is_disabled = !ff_inlink_evaluate_timeline_at_frame(link, frame);
 
-        /* TODO reindent */
-        if (dstctx->is_disabled &&
-            (dstctx->filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC))
-            filter_frame = default_filter_frame;
+    if (dstctx->is_disabled &&
+        (dstctx->filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC))
+        filter_frame = default_filter_frame;
     ret = filter_frame(link, frame);
     link->frame_count_out++;
     return ret;

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to