Merge branch 'master' into development/Compositor

rdkcentral · Dec 9, 2024 · b17050f · b17050f
2 parents 5f375f3 + 2931309
commit b17050f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Cobalt/Cobalt.conf.in b/Cobalt/Cobalt.conf.in
@@ -28,6 +28,14 @@ video = JSON()
 video.add("height", "@PLUGIN_COBALT_HEIGHT@")
 video.add("width", "@PLUGIN_COBALT_WIDTH@")
 
+graphics = JSON()
+graphics.add("height", "@PLUGIN_COBALT_HEIGHT@")
+graphics.add("width", "@PLUGIN_COBALT_WIDTH@")
+
+video = JSON()
+video.add("height", "@PLUGIN_COBALT_HEIGHT@")
+video.add("width", "@PLUGIN_COBALT_WIDTH@")
+
 root = JSON()
 root.add("mode", "@PLUGIN_COBALT_MODE@")
 root.add("locator", "lib@[email protected]")

diff --git a/Compositor/Compositor.cpp b/Compositor/Compositor.cpp
@@ -465,7 +465,6 @@ namespace Plugin {
                 else {
                     list.push_back(entry);
                 }
-
             }
             else {
                 int value = 1;
-Original file line number
+Diff line change
@@ Expand Up / @@ -465,7 +465,6 @@ namespace Plugin { @@
                     else {
                         list.push_back(entry);
                     }
                 }
                 else {
                     int value = 1;
@@ Expand Down @@