Merge "Force realtime version 1 streams to only use simple loopfilter"

vp8/encoder/onyx_if.c

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 5484e55..893062a 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1196,10 +1196,17 @@
             cpi->mode_check_freq[THR_NEW1 ] = 1 << (Tmp - 1);
         }
 
-        cm->filter_type = NORMAL_LOOPFILTER;
+        if(cm->version == 0)
+        {
+            cm->filter_type = NORMAL_LOOPFILTER;
 
-        if (Speed >= 14)
+            if (Speed >= 14)
+                cm->filter_type = SIMPLE_LOOPFILTER;
+        }
+        else
+        {
             cm->filter_type = SIMPLE_LOOPFILTER;
+        }
 
         if (Speed >= 15)
         {