From 738326394e0e80f855d21c6f1d4996f29af35ce9 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Wed, 10 Jan 2018 23:55:00 -0500
Subject: [PATCH] libhb: Reorder some code in nlmeans_prefilter for clarity.

---
 libhb/nlmeans.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c
index e6f8f1767..0ca0f4f6d 100644
--- a/libhb/nlmeans.c
+++ b/libhb/nlmeans.c
@@ -686,22 +686,18 @@ static void nlmeans_prefilter(BorderedPlane *src,
             }
         }
 
+        // Recreate borders
+        nlmeans_border(mem_pre, w, h, border);
+
         // Assign result
+        src->mem_pre   = mem_pre;
+        src->image_pre = image_pre;
         if (filter_type & NLMEANS_PREFILTER_MODE_PASSTHRU)
         {
-            // No swap needed as nlmeans_alloc() set src->mem_pre == src->mem
-            src->mem   = mem_pre;
-            src->image = image_pre;
-        }
-        else
-        {
-            src->mem_pre   = mem_pre;
-            src->image_pre = image_pre;
+            src->mem   = src->mem_pre;
+            src->image = src->image_pre;
         }
 
-        // Recreate borders
-        nlmeans_border(mem_pre, w, h, border);
-
     }
     src->prefiltered = 1;
     hb_unlock(src->mutex);
-- 
2.40.0