From 199d893ebb7da183c99149106cffb4fbf9cbc1b0 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Tue, 26 Jul 2016 15:12:12 -0400
Subject: preset: Use Main profile for Android 1080p30 and use fast combing
 detection for Very Fast presets.

---
 preset/preset_builtin.json | 10 +++++-----
 preset/preset_builtin.list |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'preset')

diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index e3fc40ced..0feb9c195 100644
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -43,7 +43,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -142,7 +142,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -241,7 +241,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -340,7 +340,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -1791,7 +1791,7 @@
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "high",
+                    "VideoProfile": "main",
                     "VideoLevel": "4.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list
index b26b7aef5..566cc383e 100644
--- a/preset/preset_builtin.list
+++ b/preset/preset_builtin.list
@@ -1,6 +1,6 @@
 <resources>
     <section name="PresetTemplate">
-        <integer name="VersionMajor" value="18" />
+        <integer name="VersionMajor" value="19" />
         <integer name="VersionMinor" value="0" />
         <integer name="VersionMicro" value="0" />
         <json name="Preset" file="preset_template.json" />
-- 
cgit v1.2.3