From ec33cdb30944ab19c028a085fcb6d974ec4e81be Mon Sep 17 00:00:00 2001
From: jb-alvarado <jb@pixelcrusher.de>
Date: Sun, 25 Jun 2023 19:17:52 +0200
Subject: [PATCH 1/2] fix player control, fix #339

---
 Cargo.lock                         | 8 ++++----
 Cargo.toml                         | 2 +-
 ffplayout-engine/src/output/hls.rs | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d8a23787..522c057e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -955,7 +955,7 @@ dependencies = [
 
 [[package]]
 name = "ffplayout"
-version = "0.18.3"
+version = "0.18.4"
 dependencies = [
  "chrono",
  "clap",
@@ -975,7 +975,7 @@ dependencies = [
 
 [[package]]
 name = "ffplayout-api"
-version = "0.18.3"
+version = "0.18.4"
 dependencies = [
  "actix-files",
  "actix-multipart",
@@ -1008,7 +1008,7 @@ dependencies = [
 
 [[package]]
 name = "ffplayout-lib"
-version = "0.18.3"
+version = "0.18.4"
 dependencies = [
  "chrono",
  "crossbeam-channel",
@@ -2891,7 +2891,7 @@ dependencies = [
 
 [[package]]
 name = "tests"
-version = "0.18.3"
+version = "0.18.4"
 dependencies = [
  "chrono",
  "crossbeam-channel",
diff --git a/Cargo.toml b/Cargo.toml
index e73e8ed6..9da269cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["ffplayout-api", "ffplayout-engine", "lib", "tests"]
 default-members = ["ffplayout-api", "ffplayout-engine", "tests"]
 
 [workspace.package]
-version = "0.18.3"
+version = "0.18.4"
 license = "GPL-3.0"
 repository = "https://github.com/ffplayout/ffplayout"
 authors = ["Jonathan Baecker <jonbae77@gmail.com>"]
diff --git a/ffplayout-engine/src/output/hls.rs b/ffplayout-engine/src/output/hls.rs
index 390f62ca..208b36e2 100644
--- a/ffplayout-engine/src/output/hls.rs
+++ b/ffplayout-engine/src/output/hls.rs
@@ -186,7 +186,7 @@ pub fn write_hls(
             enc_cmd.join(" ")
         );
 
-        let mut enc_proc = match Command::new("ffmpeg")
+        let mut dec_proc = match Command::new("ffmpeg")
             .args(enc_cmd)
             .stderr(Stdio::piped())
             .spawn()
@@ -198,8 +198,8 @@ pub fn write_hls(
             Ok(proc) => proc,
         };
 
-        let enc_err = BufReader::new(enc_proc.stderr.take().unwrap());
-        *proc_control.encoder_term.lock().unwrap() = Some(enc_proc);
+        let enc_err = BufReader::new(dec_proc.stderr.take().unwrap());
+        *proc_control.decoder_term.lock().unwrap() = Some(dec_proc);
 
         if let Err(e) = stderr_reader(enc_err, Encoder, proc_control.clone()) {
             error!("{e:?}")

From eb6f36f3fd194245d47fc61ed438b844212d2744 Mon Sep 17 00:00:00 2001
From: jb-alvarado <jb@pixelcrusher.de>
Date: Sun, 25 Jun 2023 19:19:29 +0200
Subject: [PATCH 2/2] update

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358c97e1..63230cf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.18.4](https://github.com/ffplayout/ffplayout/releases/tag/v0.18.4) (2023-06-25)
+
+### ffplayout
+
+- fix player control in HLS Mode [ec33cdb](https://github.com/ffplayout/ffplayout/commit/ec33cdb30944ab19c028a085fcb6d974ec4e81be)
+
+
 ## [0.18.3](https://github.com/ffplayout/ffplayout/releases/tag/v0.18.3) (2023-06-16)
 
 ### ffpapi