From d0c20d2bb7d77965d2981b2fa1f698f308cc9ecf Mon Sep 17 00:00:00 2001
From: Rickard Sjoberg <rickard.sjoberg@ericsson.com>
Date: Thu, 24 Oct 2019 10:37:25 +0200
Subject: [PATCH] JVET-O0549 Code cleanup after rebasing: remove an empty line
and an instance of duplicated code
---
source/App/EncoderApp/EncAppCfg.cpp | 1 -
source/App/EncoderApp/EncAppCfg.h | 7 -------
2 files changed, 8 deletions(-)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 24ec767c7..0b07ec200 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -35,7 +35,6 @@
\brief Handle encoder configuration parameters
*/
-
#include "EncAppCfg.h"
#include <stdio.h>
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 9f60509ae..1269ebd1f 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -48,13 +48,6 @@ static inline std::istream& operator >> (std::istream &in, std::map<T1, T2> &map
#include "Utilities/program_options_lite.h"
#endif
-#if JVET_O0549_ENCODER_ONLY_FILTER
-#include <map>
-template <class T1, class T2>
-static inline std::istream& operator >> (std::istream &in, std::map<T1, T2> &map);
-#include "Utilities/program_options_lite.h"
-#endif
-
#include "EncoderLib/EncCfg.h"
#if EXTENSION_360_VIDEO
#include "AppEncHelper360/TExt360AppEncCfg.h"
--
GitLab