X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.cpp;h=dba6cf38b26b3ca87a6a953c8842600012e0124b;hp=7f95b2693a96ea0e56f858eb484c68e8f7a84031;hb=18a554f90798ccc30999e387054a4a6fcc75a7ce;hpb=cb7371a29fd92d3f7dfff29bae185a54d7f99951

diff --git a/input.cpp b/input.cpp
index 7f95b26..dba6cf3 100644
--- a/input.cpp
+++ b/input.cpp
@@ -98,23 +98,23 @@ Input *create_input(const string &url, Input::Encoding encoding)
 {
 	string protocol, user, host, port, path;
 	if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
-		return NULL;
+		return nullptr;
 	}
 	if (protocol == "http") {
 		return new HTTPInput(url, encoding);
 	}
 	if (protocol == "udp") {
-		// encoding is ignored; it's never Metacube.
+		assert(encoding == Input::INPUT_ENCODING_RAW);
 		return new UDPInput(url);
 	}
-	return NULL;
+	return nullptr;
 }
 
 Input *create_input(const InputProto &serialized)
 {
 	string protocol, user, host, port, path;
 	if (!parse_url(serialized.url(), &protocol, &user, &host, &port, &path)) {
-		return NULL;
+		return nullptr;
 	}
 	if (protocol == "http") {
 		return new HTTPInput(serialized);
@@ -122,7 +122,7 @@ Input *create_input(const InputProto &serialized)
 	if (protocol == "udp") {
 		return new UDPInput(serialized);
 	}
-	return NULL;
+	return nullptr;
 }
 
 Input::~Input() {}