diff --git a/CMakeLists.txt b/CMakeLists.txt
index 296b15e..a630553 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(moonlight-embedded VERSION 2.4.5 LANGUAGES C)
+project(moonlight-embedded VERSION 2.4.6 LANGUAGES C)
 SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 SET(CMAKE_C_STANDARD 99)
 include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake)
diff --git a/libgamestream/CMakeLists.txt b/libgamestream/CMakeLists.txt
index a82131d..7ee2011 100644
--- a/libgamestream/CMakeLists.txt
+++ b/libgamestream/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SO_VERSION 2)
+set(SO_VERSION 3)
 
 find_package(LibUUID REQUIRED)
 find_package(Threads REQUIRED)
diff --git a/libgamestream/sps.c b/libgamestream/sps.c
index a7c98c5..e61c113 100644
--- a/libgamestream/sps.c
+++ b/libgamestream/sps.c
@@ -32,19 +32,20 @@ void gs_sps_init(int width, int height) {
   initial_height = height;
 }
 
-PLENTRY gs_sps_fix(PLENTRY *head, int flags) {
-  PLENTRY entry = *head;
+void gs_sps_fix(PDECODE_UNIT decodeUnit, int flags) {
+  PLENTRY entry = decodeUnit->bufferList;
   const char naluHeader[] = {0x00, 0x00, 0x00, 0x01};
 
   if (replay_sps == 1) {
     PLENTRY replay_entry = (PLENTRY) malloc(sizeof(*replay_entry) + 128);
     if (replay_entry == NULL)
-      return NULL;
+      return;
 
     replay_entry->data = (char *) (entry + 1);
     memcpy(replay_entry->data, naluHeader, sizeof(naluHeader));
     h264_stream->sps->profile_idc = H264_PROFILE_HIGH;
     replay_entry->length = write_nal_unit(h264_stream, replay_entry->data+4, 124) + 4;
+    decodeUnit->fullLength += replay_entry->length;
 
     replay_entry->next = entry;
     entry = replay_entry;
@@ -97,20 +98,21 @@ PLENTRY gs_sps_fix(PLENTRY *head, int flags) {
 
     PLENTRY sps_entry = (PLENTRY) malloc(sizeof(*sps_entry) + 128);
     if (sps_entry == NULL)
-      return NULL;
+      return;
 
     PLENTRY next = entry->next;
+    decodeUnit->fullLength -= entry->length;
     free(entry);
     sps_entry->data = (char*) (sps_entry + 1);
     memcpy(sps_entry->data, naluHeader, sizeof(naluHeader));
     sps_entry->length = write_nal_unit(h264_stream, sps_entry->data+4, 124) + 4;
     sps_entry->next = next;
     entry = sps_entry;
+    decodeUnit->fullLength += entry->length;
   } else if ((entry->data[4] & 0x1F) == NAL_UNIT_TYPE_PPS) {
     if ((flags & GS_SPS_BASELINE_HACK) == GS_SPS_BASELINE_HACK && !replay_sps)
       replay_sps = 1;
 
   }
-  *head = entry;
-  return entry;
+  decodeUnit->bufferList = entry;
 }
diff --git a/libgamestream/sps.h b/libgamestream/sps.h
index ed55c3f..6752323 100644
--- a/libgamestream/sps.h
+++ b/libgamestream/sps.h
@@ -23,4 +23,4 @@
 #define GS_SPS_BASELINE_HACK 0x02
 
 void gs_sps_init(int width, int height);
-PLENTRY gs_sps_fix(PLENTRY *entry, int flags);
+void gs_sps_fix(PDECODE_UNIT decodeUnit, int flags);
diff --git a/src/video/pi.c b/src/video/pi.c
index 156b797..66dcfbc 100644
--- a/src/video/pi.c
+++ b/src/video/pi.c
@@ -47,9 +47,6 @@ static ILCLIENT_T *client;
 
 static COMPONENT_T *video_decode = NULL, *video_scheduler = NULL, *video_render = NULL;
 
-static OMX_BUFFERHEADERTYPE *buf;
-static unsigned char *dest;
-
 static int port_settings_changed;
 static int first_packet;
 
@@ -177,6 +174,7 @@ static int decoder_renderer_setup(int videoFormat, int width, int height, int re
 static void decoder_renderer_cleanup() {
   int status = 0;
 
+  OMX_BUFFERHEADERTYPE *buf;
   if((buf = ilclient_get_input_buffer(video_decode, 130, 1)) == NULL){
     fprintf(stderr, "Can't get video buffer\n");
     exit(EXIT_FAILURE);
@@ -209,51 +207,48 @@ static void decoder_renderer_cleanup() {
 }
 
 static int decoder_renderer_submit_decode_unit(PDECODE_UNIT decodeUnit) {
-  if((buf = ilclient_get_input_buffer(video_decode, 130, 1)) == NULL){
-    fprintf(stderr, "Can't get video buffer\n");
-    exit(EXIT_FAILURE);
-  }
+  OMX_BUFFERHEADERTYPE *buf = NULL;
 
-  // feed data and wait until we get port settings changed
-  dest = buf->pBuffer;
-
-  buf->nFilledLen = 0;
-
-  buf->nOffset = 0;
-
-  buf->nFlags = OMX_BUFFERFLAG_ENDOFFRAME | OMX_BUFFERFLAG_EOS;
-
-  if(first_packet) {
-    buf->nFlags = OMX_BUFFERFLAG_STARTTIME;
-    first_packet = 0;
-  }
-
-  PLENTRY entry = gs_sps_fix(&decodeUnit->bufferList, GS_SPS_BITSTREAM_FIXUP);
-  decodeUnit->bufferList = entry;
+  gs_sps_fix(decodeUnit, GS_SPS_BITSTREAM_FIXUP);
+  PLENTRY entry = decodeUnit->bufferList;
   while (entry != NULL) {
-    memcpy(dest, entry->data, entry->length);
-    buf->nFilledLen += entry->length;
-    dest += entry->length;
-    entry = entry->next;
-  }
-
-  if(port_settings_changed == 0 &&
-    ((buf->nFilledLen > 0 && ilclient_remove_event(video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1) == 0) ||
-    (buf->nFilledLen == 0 && ilclient_wait_for_event(video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1,
-                        ILCLIENT_EVENT_ERROR | ILCLIENT_PARAMETER_CHANGED, 10000) == 0))) {
-    port_settings_changed = 1;
-
-    if(ilclient_setup_tunnel(tunnel, 0, 0) != 0){
-      fprintf(stderr, "Can't setup video\n");
-      exit(EXIT_FAILURE);
+    if (buf == NULL) {
+      if ((buf = ilclient_get_input_buffer(video_decode, 130, 1)) == NULL) {
+        fprintf(stderr, "Can't get video buffer\n");
+        exit(EXIT_FAILURE);
+      }
+      buf->nFilledLen = 0;
+      buf->nOffset = 0;
+      buf->nFlags = OMX_BUFFERFLAG_ENDOFFRAME | OMX_BUFFERFLAG_EOS;
+      if(first_packet) {
+        buf->nFlags = OMX_BUFFERFLAG_STARTTIME;
+        first_packet = 0;
+      }
     }
 
-    ilclient_change_component_state(video_render, OMX_StateExecuting);
-  }
+    memcpy(buf->pBuffer + buf->nFilledLen, entry->data, entry->length);
+    buf->nFilledLen += entry->length;
 
-  if(OMX_EmptyThisBuffer(ILC_GET_HANDLE(video_decode), buf) != OMX_ErrorNone){
-    fprintf(stderr, "Can't empty video buffer\n");
-    exit(EXIT_FAILURE);
+    if (entry->bufferType != BUFFER_TYPE_PICDATA || entry->next == NULL || entry->next->bufferType != BUFFER_TYPE_PICDATA) {
+      if(port_settings_changed == 0 && ((buf->nFilledLen > 0 && ilclient_remove_event(video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1) == 0) || (buf->nFilledLen == 0 && ilclient_wait_for_event(video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1, ILCLIENT_EVENT_ERROR | ILCLIENT_PARAMETER_CHANGED, 10000) == 0))) {
+        port_settings_changed = 1;
+
+        if(ilclient_setup_tunnel(tunnel, 0, 0) != 0) {
+          fprintf(stderr, "Can't setup video\n");
+          exit(EXIT_FAILURE);
+        }
+
+        ilclient_change_component_state(video_render, OMX_StateExecuting);
+      }
+
+      if(OMX_EmptyThisBuffer(ILC_GET_HANDLE(video_decode), buf) != OMX_ErrorNone){
+        fprintf(stderr, "Can't empty video buffer\n");
+        exit(EXIT_FAILURE);
+      }
+      buf = NULL;
+    }
+
+    entry = entry->next;
   }
 
   return DR_OK;