简化命名空间

This commit is contained in:
xiongziliang
2018-10-24 17:17:55 +08:00
parent ed1402e9d6
commit 9f16cc1201
133 changed files with 446 additions and 788 deletions

View File

@@ -39,22 +39,18 @@
#include "Util/TimeTicker.h"
using namespace std;
using namespace ZL::Rtsp;
using namespace ZL::Util;
using namespace toolkit;
#ifdef ENABLE_FAAC
#include "Codec/AACEncoder.h"
using namespace ZL::Codec;
#endif //ENABLE_FAAC
#ifdef ENABLE_X264
#include "Codec/H264Encoder.h"
using namespace ZL::Codec;
#endif //ENABLE_X264
namespace ZL {
namespace DEV {
namespace mediakit {
class VideoInfo {
public:
@@ -124,7 +120,6 @@ private:
};
} /* namespace DEV */
} /* namespace ZL */
} /* namespace mediakit */
#endif /* DEVICE_DEVICE_H_ */