From 0252c9e137e77d0395afc1b0bfe01d1042dcb944 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Dec 2023 16:02:39 +0100
Subject: [PATCH 1/2] OP-7606 - fix creation of .mov (#6064)

---
 openpype/hosts/photoshop/plugins/publish/extract_review.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/photoshop/plugins/publish/extract_review.py b/openpype/hosts/photoshop/plugins/publish/extract_review.py
index c2773b2a20..09c5d63aa5 100644
--- a/openpype/hosts/photoshop/plugins/publish/extract_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/extract_review.py
@@ -170,8 +170,7 @@ class ExtractReview(publish.Extractor):
         # Generate mov.
         mov_path = os.path.join(staging_dir, "review.mov")
         self.log.info(f"Generate mov review: {mov_path}")
-        args = [
-            ffmpeg_path,
+        args = ffmpeg_path + [
             "-y",
             "-i", source_files_pattern,
             "-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2",

From 8c387c30432d29d576bd702637382571bbc6f8b9 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Dec 2023 16:39:29 +0100
Subject: [PATCH 2/2] Photoshop: fix Collect Color Coded settings (#6065)

* OP-7609 - fix Photoshop publish plugin model

Was causing issues when saving settings for `Collect Color Coded Instances`

* OP-7609 - bump up version for Photoshop addon

Caused by change of Settings model.
---
 server_addon/photoshop/server/settings/publish_plugins.py | 2 +-
 server_addon/photoshop/server/version.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server_addon/photoshop/server/settings/publish_plugins.py b/server_addon/photoshop/server/settings/publish_plugins.py
index 2863979ca9..21e7d670f0 100644
--- a/server_addon/photoshop/server/settings/publish_plugins.py
+++ b/server_addon/photoshop/server/settings/publish_plugins.py
@@ -29,7 +29,7 @@ class ColorCodeMappings(BaseSettingsModel):
     )
 
     layer_name_regex: list[str] = Field(
-        "",
+        default_factory=list,
         title="Layer name regex"
     )
 
diff --git a/server_addon/photoshop/server/version.py b/server_addon/photoshop/server/version.py
index d4b9e2d7f3..a242f0e757 100644
--- a/server_addon/photoshop/server/version.py
+++ b/server_addon/photoshop/server/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.0"
+__version__ = "0.1.1"