diff --git a/README.md b/README.md
index 673d5c6..7817cdb 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ In future, the support for MPEG-DASH is planned as well
 Add the following line to your `deps` in `mix.exs`. Run `mix deps.get`.
 
 ```elixir
-	{:membrane_http_adaptive_stream_plugin, "~> 0.18.2"}
+	{:membrane_http_adaptive_stream_plugin, "~> 0.18.3"}
 ```
 
 ## Usage Example
diff --git a/mix.exs b/mix.exs
index 7e56460..84845d5 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Membrane.HTTPAdaptiveStream.MixProject do
   use Mix.Project
 
-  @version "0.18.2"
+  @version "0.18.3"
   @github_url "https://github.com/membraneframework/membrane_http_adaptive_stream_plugin"
 
   def project do
@@ -65,9 +65,9 @@ defmodule Membrane.HTTPAdaptiveStream.MixProject do
     [
       {:membrane_core, "~> 1.0"},
       {:membrane_tee_plugin, "~> 0.12.0"},
-      {:membrane_mp4_plugin, "~> 0.31.0"},
+      {:membrane_mp4_plugin, "~> 0.33.1"},
       {:membrane_aac_plugin, "~> 0.18.0"},
-      {:membrane_h264_plugin, "~> 0.9.0"},
+      {:membrane_h26x_plugin, "~> 0.10.0"},
       {:bunch, "~> 1.6"},
       {:qex, "~> 0.5"},
       {:membrane_hackney_plugin, "~> 0.11.0", only: :test},
diff --git a/mix.lock b/mix.lock
index 641460f..cd1c6de 100644
--- a/mix.lock
+++ b/mix.lock
@@ -19,14 +19,14 @@
   "membrane_aac_format": {:hex, :membrane_aac_format, "0.8.0", "515631eabd6e584e0e9af2cea80471fee6246484dbbefc4726c1d93ece8e0838", [:mix], [{:bimap, "~> 1.1", [hex: :bimap, repo: "hexpm", optional: false]}], "hexpm", "a30176a94491033ed32be45e51d509fc70a5ee6e751f12fd6c0d60bd637013f6"},
   "membrane_aac_plugin": {:hex, :membrane_aac_plugin, "0.18.1", "30433bffd4d5d773f79448dd9afd55d77338721688f09a89b20d742a68cc2c3d", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_aac_format, "~> 0.8.0", [hex: :membrane_aac_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "8fd048c47d5d2949eb557e19f43f62d534d3af5096187f1a1a3a1694d14b772c"},
   "membrane_cmaf_format": {:hex, :membrane_cmaf_format, "0.7.0", "573bfff6acf2371c5046b9174569f6316f4205e3d6e13e814bf7e613e5653a54", [:mix], [], "hexpm", "4ac6a24a33f61347a2714c982a5f84aa6207641f4de2ad5afde68a8b800da8de"},
-  "membrane_core": {:hex, :membrane_core, "1.0.0", "1b543aefd952283be1f2a215a1db213aa4d91222722ba03cd35280622f1905ee", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 3.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "352c90fd0a29942143c4bf7a727cc05c632e323f50a1a4e99321b1e8982f1533"},
+  "membrane_core": {:hex, :membrane_core, "1.0.1", "08aa546c0d131c66f8b906b3dfb2b8f2749b56859f6fc52bd3ac846b944b3baa", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 3.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a35ed68561bdf0a2dbb2f994333be78cf4e1c4d734e4cd927d77d92049bb1273"},
   "membrane_file_plugin": {:hex, :membrane_file_plugin, "0.16.0", "7917f6682c22b9bcfc2ca20ed960eee0f7d03ad31fd5f59ed850f1fe3ddd545a", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "b0727998f75a9b4dab8a2baefdfc13c3eac00a04e061ab1b0e61dc5566927acc"},
   "membrane_h264_format": {:hex, :membrane_h264_format, "0.6.1", "44836cd9de0abe989b146df1e114507787efc0cf0da2368f17a10c47b4e0738c", [:mix], [], "hexpm", "4b79be56465a876d2eac2c3af99e115374bbdc03eb1dea4f696ee9a8033cd4b0"},
-  "membrane_h264_plugin": {:hex, :membrane_h264_plugin, "0.9.1", "ea140ab1ca21c528563675fdd7e14c80607e120e320dc930cac3dcfb4db3fc2b", [:mix], [{:bunch, "~> 1.4", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}], "hexpm", "8f10db817e691fc1234ed85fe674b3f8718d3a410e4582736dcdd53664cae725"},
   "membrane_h265_format": {:hex, :membrane_h265_format, "0.2.0", "1903c072cf7b0980c4d0c117ab61a2cd33e88782b696290de29570a7fab34819", [:mix], [], "hexpm", "6df418bdf242c0d9f7dbf2e5aea4c2d182e34ac9ad5a8b8cef2610c290002e83"},
+  "membrane_h26x_plugin": {:hex, :membrane_h26x_plugin, "0.10.0", "0a7c6b9a7678e8c111b22b5417465ac31cf6e598cff6a53ab53a9c379bdfa1ef", [:mix], [{:bunch, "~> 1.4", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_h265_format, "~> 0.2.0", [hex: :membrane_h265_format, repo: "hexpm", optional: false]}], "hexpm", "e9cde8c8995ace9fc26355037cbcc780f1727a3f63d36c21b52232fd29d0ad40"},
   "membrane_hackney_plugin": {:hex, :membrane_hackney_plugin, "0.11.0", "54b368333a23394e7cac2f4d6b701bf8c5ee6614670a31f4ebe009b5e691a5c1", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:mockery, "~> 2.3", [hex: :mockery, repo: "hexpm", optional: false]}], "hexpm", "2b28fd1be3c889d5824d7d985598386c7673828c88f49a91221df3626af8a998"},
   "membrane_mp4_format": {:hex, :membrane_mp4_format, "0.8.0", "8c6e7d68829228117d333b4fbb030e7be829aab49dd8cb047fdc664db1812e6a", [:mix], [], "hexpm", "148dea678a1f82ccfd44dbde6f936d2f21255f496cb45a22cc6eec427f025522"},
-  "membrane_mp4_plugin": {:hex, :membrane_mp4_plugin, "0.31.0", "1932c86e2f4a24aca1b99ee531a131fd0da1128db8975ba8f8738e3b1bbcfabd", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_aac_format, "~> 0.8.0", [hex: :membrane_aac_format, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.7.0", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.16.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.1", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_h264_plugin, "~> 0.9.0", [hex: :membrane_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_h265_format, "~> 0.2.0", [hex: :membrane_h265_format, repo: "hexpm", optional: false]}, {:membrane_mp4_format, "~> 0.8.0", [hex: :membrane_mp4_format, repo: "hexpm", optional: false]}, {:membrane_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}], "hexpm", "9968e56e02085228974bf6a59c8858f3c0d9800a4e767c1b3b2f2890050c72f4"},
+  "membrane_mp4_plugin": {:hex, :membrane_mp4_plugin, "0.33.1", "190ca3768333728e85dd831a9607c2b600a091463f2affdfe18123ed10c927e4", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_aac_format, "~> 0.8.0", [hex: :membrane_aac_format, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.7.0", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.16.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.1", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_h265_format, "~> 0.2.0", [hex: :membrane_h265_format, repo: "hexpm", optional: false]}, {:membrane_h26x_plugin, "~> 0.10.0", [hex: :membrane_h26x_plugin, repo: "hexpm", optional: false]}, {:membrane_mp4_format, "~> 0.8.0", [hex: :membrane_mp4_format, repo: "hexpm", optional: false]}, {:membrane_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}], "hexpm", "6c783ab882099461755a9cb3debc6c2b82137b1f9f5a7292be216f36dec187a3"},
   "membrane_opus_format": {:hex, :membrane_opus_format, "0.3.0", "3804d9916058b7cfa2baa0131a644d8186198d64f52d592ae09e0942513cb4c2", [:mix], [], "hexpm", "8fc89c97be50de23ded15f2050fe603dcce732566fe6fdd15a2de01cb6b81afe"},
   "membrane_tee_plugin": {:hex, :membrane_tee_plugin, "0.12.0", "f94989b4080ef4b7937d74c1a14d3379577c7bd4c6d06e5a2bb41c351ad604d4", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "0d61c9ed5e68e5a75d54200e1c6df5739c0bcb52fee0974183ad72446a179887"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_540x360.m4s
index 187ecd1..5d841b3 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_720x480.m4s
index 055487d..2a7c54b 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_0_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_540x360.m4s
index 8fd3a6f..f9b2f9b 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_720x480.m4s
index 5b6dacb..71326fb 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_1_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_540x360.m4s
index 9e3967b..595f304 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_720x480.m4s
index 718ba75..64965c3 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_2_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_540x360.m4s
index beb8238..844d337 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_720x480.m4s
index 68cf15c..b421489 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_3_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_540x360.m4s
index c73fc99..21afbdb 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_720x480.m4s
index 53cf28f..81e72e0 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_4_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_540x360.m4s
index accbf7d..8722dd1 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_720x480.m4s
index d2a3f89..e1862f4 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_5_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_540x360.m4s
index ab9cfda..28915a5 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_720x480.m4s
index 4a24cb6..c614c43 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_6_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_540x360.m4s
index 70263a6..f5f166a 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_720x480.m4s
index 87b0ef3..d6c73c7 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_7_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_540x360.m4s
index 54fa9a1..e45e879 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_720x480.m4s
index 3107277..1cefc41 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_multiple_video_tracks/video_segment_8_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_0_video_track.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_0_video_track.m4s
index 0f6ef24..c47c229 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_0_video_track.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_0_video_track.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_1_video_track.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_1_video_track.m4s
index ec4a16f..0f64dca 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_1_video_track.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/audio_video_tracks/video_segment_1_video_track.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_540x360.m4s
index ab9cfda..28915a5 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_720x480.m4s
index 4a24cb6..c614c43 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_6_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_540x360.m4s
index 70263a6..f5f166a 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_720x480.m4s
index 87b0ef3..d6c73c7 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_7_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_540x360.m4s
index 54fa9a1..e45e879 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_720x480.m4s
index 3107277..1cefc41 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/live/video_segment_8_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/index.m3u8 b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/index.m3u8
index 1d297cc..5f7ff8a 100644
--- a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/index.m3u8
+++ b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/index.m3u8
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXT-X-VERSION:7
 #EXT-X-INDEPENDENT-SEGMENTS
-#EXT-X-STREAM-INF:BANDWIDTH=1253302,AVERAGE-BANDWIDTH=917161,RESOLUTION=480x270,FRAME-RATE=25,CODECS="avc1.42e015,mp4a.40.2"
+#EXT-X-STREAM-INF:BANDWIDTH=1252874,AVERAGE-BANDWIDTH=917273,RESOLUTION=480x270,FRAME-RATE=25,CODECS="avc1.42e015,mp4a.40.2"
 video_480x270.m3u8
-#EXT-X-STREAM-INF:BANDWIDTH=760849,AVERAGE-BANDWIDTH=447696,RESOLUTION=540x360,FRAME-RATE=25,CODECS="avc1.640015,mp4a.40.2"
+#EXT-X-STREAM-INF:BANDWIDTH=763588,AVERAGE-BANDWIDTH=447929,RESOLUTION=540x360,FRAME-RATE=25,CODECS="avc1.640015,mp4a.40.2"
 video_540x360.m3u8
-#EXT-X-STREAM-INF:BANDWIDTH=1088194,AVERAGE-BANDWIDTH=597825,RESOLUTION=720x480,FRAME-RATE=25,CODECS="avc1.64001e,mp4a.40.2"
+#EXT-X-STREAM-INF:BANDWIDTH=1087782,AVERAGE-BANDWIDTH=597835,RESOLUTION=720x480,FRAME-RATE=25,CODECS="avc1.64001e,mp4a.40.2"
 video_720x480.m3u8
\ No newline at end of file
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_480x270.m4s
index 3a019a5..60fe8d0 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_540x360.m4s
index 96e1213..03f3bb1 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_720x480.m4s
index 5c97ffa..9b300f6 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_0_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_480x270.m4s
index f18739b..f947e51 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_540x360.m4s
index 1965f46..446732a 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_720x480.m4s
index 7ae79cc..2402e3e 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_1_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_480x270.m4s
index 798c4cf..f9753f7 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_540x360.m4s
index 410f620..8b94199 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_720x480.m4s
index c314082..1a0244d 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_2_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_480x270.m4s
index 5b75dbb..bc7fcb9 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_540x360.m4s
index d21ef85..78be87d 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_720x480.m4s
index 3b6cc40..9335223 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_3_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_480x270.m4s
index a692b7e..4648873 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_540x360.m4s
index f30f53f..11e6001 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_720x480.m4s
index e8942b4..61d8025 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_4_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_480x270.m4s
index 18e74c8..af2879f 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_540x360.m4s
index 478d1aa..ca2472e 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_720x480.m4s
index 8e4ef79..03aba9d 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_5_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_480x270.m4s
index 9f0cde7..cc82113 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_540x360.m4s
index 0ce0d75..03e37c5 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_720x480.m4s
index 764e1a0..eb09110 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_6_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_480x270.m4s
index b317e52..1526b1e 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_540x360.m4s
index 4e3fd91..4acc78e 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_720x480.m4s
index dab06ad..7aed06d 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_7_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_480x270.m4s
index 5c8ef29..ee3de7c 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_540x360.m4s
index 17f8bb7..2a3109c 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_720x480.m4s
index 5637d5a..22d875d 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_8_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_9_video_480x270.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_9_video_480x270.m4s
index 6a904e2..90ba257 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_9_video_480x270.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/muxed_segment_9_video_480x270.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_480x270.m3u8 b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_480x270.m3u8
index f2b7911..cdd71dc 100644
--- a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_480x270.m3u8
+++ b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_480x270.m3u8
@@ -4,7 +4,7 @@
 #EXT-X-MEDIA-SEQUENCE:0
 #EXT-X-DISCONTINUITY-SEQUENCE:0
 #EXT-X-MAP:URI="muxed_header_video_480x270_part_0.mp4"
-#EXTINF:4.780045351,
+#EXTINF:4.803265306,
 muxed_segment_0_video_480x270.m4s
 #EXTINF:4.287845805,
 muxed_segment_1_video_480x270.m4s
@@ -16,12 +16,12 @@ muxed_segment_3_video_480x270.m4s
 muxed_segment_4_video_480x270.m4s
 #EXTINF:2.879637188,
 muxed_segment_5_video_480x270.m4s
-#EXTINF:4.803265306,
+#EXTINF:4.791655328,
 muxed_segment_6_video_480x270.m4s
 #EXTINF:2.320997732,
 muxed_segment_7_video_480x270.m4s
-#EXTINF:3.953696145,
+#EXTINF:3.965306122,
 muxed_segment_8_video_480x270.m4s
-#EXTINF:2.795736961,
+#EXTINF:2.772517006,
 muxed_segment_9_video_480x270.m4s
 #EXT-X-ENDLIST
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_540x360.m3u8 b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_540x360.m3u8
index 312a75d..16507ca 100644
--- a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_540x360.m3u8
+++ b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_540x360.m3u8
@@ -4,7 +4,7 @@
 #EXT-X-MEDIA-SEQUENCE:0
 #EXT-X-DISCONTINUITY-SEQUENCE:0
 #EXT-X-MAP:URI="muxed_header_video_540x360_part_0.mp4"
-#EXTINF:8.766031746,
+#EXTINF:8.7892517,
 muxed_segment_0_video_540x360.m4s
 #EXTINF:2.116507936,
 muxed_segment_1_video_540x360.m4s
@@ -14,12 +14,12 @@ muxed_segment_2_video_540x360.m4s
 muxed_segment_3_video_540x360.m4s
 #EXTINF:2.95446712,
 muxed_segment_4_video_540x360.m4s
-#EXTINF:2.010068027,
+#EXTINF:1.99845805,
 muxed_segment_5_video_540x360.m4s
-#EXTINF:3.953696145,
+#EXTINF:3.965306122,
 muxed_segment_6_video_540x360.m4s
 #EXTINF:5.039365079,
 muxed_segment_7_video_540x360.m4s
-#EXTINF:3.097596371,
+#EXTINF:3.074376417,
 muxed_segment_8_video_540x360.m4s
 #EXT-X-ENDLIST
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_720x480.m3u8 b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_720x480.m3u8
index cf9c4cc..2d3c353 100644
--- a/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_720x480.m3u8
+++ b/test/membrane_http_adaptive_stream/integration_test/fixtures/muxed_av/video_720x480.m3u8
@@ -4,7 +4,7 @@
 #EXT-X-MEDIA-SEQUENCE:0
 #EXT-X-DISCONTINUITY-SEQUENCE:0
 #EXT-X-MAP:URI="muxed_header_video_720x480_part_0.mp4"
-#EXTINF:8.766031746,
+#EXTINF:8.7892517,
 muxed_segment_0_video_720x480.m4s
 #EXTINF:2.116507936,
 muxed_segment_1_video_720x480.m4s
@@ -12,14 +12,14 @@ muxed_segment_1_video_720x480.m4s
 muxed_segment_2_video_720x480.m4s
 #EXTINF:2.804807256,
 muxed_segment_3_video_720x480.m4s
-#EXTINF:2.997687075,
+#EXTINF:2.997687074,
 muxed_segment_4_video_720x480.m4s
 #EXTINF:1.99845805,
 muxed_segment_5_video_720x480.m4s
-#EXTINF:3.922086167,
+#EXTINF:3.922086168,
 muxed_segment_6_video_720x480.m4s
 #EXTINF:5.039365079,
 muxed_segment_7_video_720x480.m4s
-#EXTINF:3.097596371,
+#EXTINF:3.074376417,
 muxed_segment_8_video_720x480.m4s
 #EXT-X-ENDLIST
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_540x360.m4s
index 187ecd1..5d841b3 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_720x480.m4s
index 055487d..2a7c54b 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_0_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_540x360.m4s
index 8fd3a6f..f9b2f9b 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_720x480.m4s
index 5b6dacb..71326fb 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_1_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_540x360.m4s
index 9e3967b..595f304 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_720x480.m4s
index 718ba75..64965c3 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_2_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_540x360.m4s
index beb8238..844d337 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_720x480.m4s
index 68cf15c..b421489 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_3_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_540x360.m4s
index c73fc99..21afbdb 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_720x480.m4s
index 53cf28f..81e72e0 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_4_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_540x360.m4s
index accbf7d..8722dd1 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_720x480.m4s
index d2a3f89..e1862f4 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_5_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_540x360.m4s
index ab9cfda..28915a5 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_720x480.m4s
index 4a24cb6..c614c43 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_6_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_540x360.m4s
index 70263a6..f5f166a 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_720x480.m4s
index 87b0ef3..d6c73c7 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_7_video_720x480.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_540x360.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_540x360.m4s
index 54fa9a1..e45e879 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_540x360.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_540x360.m4s differ
diff --git a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_720x480.m4s b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_720x480.m4s
index 3107277..1cefc41 100644
Binary files a/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_720x480.m4s and b/test/membrane_http_adaptive_stream/integration_test/fixtures/persisted/video_segment_8_video_720x480.m4s differ