Merge branch 'JVET-O0549_ENCODER_ONLY_FILTER' of...

Merge branch 'JVET-O0549_ENCODER_ONLY_FILTER' of https://vcgit.hhi.fraunhofer.de/rickard/VVCSoftware_VTM into JVET-O0549_ENCODER_ONLY_FILTER

source/App/EncoderApp/EncAppCfg.cpp

@@ -35,6 +35,7 @@
     \brief    Handle encoder configuration parameters
 */
 
+
 #include "EncAppCfg.h"
 
 #include <stdio.h>

source/App/EncoderApp/EncAppCfg.h

@@ -39,6 +39,14 @@
 #define __ENCAPPCFG__
 
 #include "CommonLib/CommonDef.h"
+#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
 
 #if JVET_O0549_ENCODER_ONLY_FILTER
 #include <map>