From 1c38fbbd3b75cd35f4fd5ab5102e9b1278e1f25e Mon Sep 17 00:00:00 2001
From: Marko Viitanen <fador@iki.fi>
Date: Tue, 10 Mar 2015 10:45:05 +0200
Subject: [PATCH] Fixed GOP when no threads are used

---
 src/encoderstate.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/encoderstate.c b/src/encoderstate.c
index 5910704e..448a5251 100644
--- a/src/encoderstate.c
+++ b/src/encoderstate.c
@@ -1002,8 +1002,7 @@ void encoder_next_frame(encoder_state_t *state) {
 
   
 
-  if (!encoder->cfg->gop_len || use_as_ref[(state->global->poc) % 8]) {
-
+  if (!encoder->cfg->gop_len || !state->global->poc || use_as_ref[(state->global->poc) % 8]) {
     // Remove the ref pic (if present)
     if (state->global->ref->used_size == (uint32_t)encoder->cfg->ref_frames) {
       image_list_rem(state->global->ref, state->global->ref->used_size - 1);
@@ -1015,7 +1014,13 @@ void encoder_next_frame(encoder_state_t *state) {
   image_free(state->tile->frame->rec);
   
   state->global->frame++;
-  //state->global->poc++;
+  state->global->poc++;
+  if (state->encoder_control->cfg->gop_len) {
+    // Calculate POC according to the global frame counter and GOP structure
+    state->global->poc = state->global->frame -
+      (state->global->frame % 8) +
+      state->encoder_control->cfg->gop[(state->global->frame - 1) % 8].poc_offset;
+  }
   
   state->tile->frame->rec = image_alloc(state->tile->frame->width, state->tile->frame->height, state->global->poc);
   videoframe_set_poc(state->tile->frame, state->global->poc);