From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 20 Apr 2013 12:12:41 +0000 (+0200)
Subject: Revert "Fix a bug where Metacube streams would become inconsistent between different... 
X-Git-Tag: 1.0.0~57
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=5179ad190827a75ee096f2cc92d3f0d8837eff72;ds=sidebyside

Revert "Fix a bug where Metacube streams would become inconsistent between different servers, since the first one did not get the right encoding set."

Doesn't actually fix the issue.

This reverts commit 5605c88a27fcf64ea8f6fd6cbb52dada73856ee0.
---

diff --git a/main.cpp b/main.cpp
index 0aa91f3..c89ec72 100644
--- a/main.cpp
+++ b/main.cpp
@@ -153,9 +153,9 @@ void create_streams(const Config &config,
 			                    Stream::Encoding(stream_config.encoding));
 		} else {
 			servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
+			servers->set_encoding(stream_config.stream_id,
+			                      Stream::Encoding(stream_config.encoding));
 		}
-		servers->set_encoding(stream_config.stream_id,
-				      Stream::Encoding(stream_config.encoding));
 		expecting_stream_ids.erase(stream_config.stream_id);
 
 		if (stream_config.mark_pool != -1) {