From d3c9e83bfc6624a373081bc2217e795a0d2cccff Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <mo@bunkus.online>
Date: Tue, 17 Aug 2021 23:38:46 +0200
Subject: [PATCH] AVC/HEVC ES packetizers: cleanup after simplification

---
 src/output/p_avc_es.cpp  | 9 +--------
 src/output/p_hevc_es.cpp | 8 +-------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/output/p_avc_es.cpp b/src/output/p_avc_es.cpp
index d53bcb41a..a0a21b2fd 100644
--- a/src/output/p_avc_es.cpp
+++ b/src/output/p_avc_es.cpp
@@ -13,19 +13,12 @@
 
 #include "common/common_pch.h"
 
-#include <matroska/KaxTracks.h>
-
 #include "common/avc/es_parser.h"
 #include "common/codec.h"
-#include "common/hacks.h"
-#include "common/mpeg.h"
 #include "merge/connection_checks.h"
 #include "merge/generic_reader.h"
-#include "merge/output_control.h"
 #include "output/p_avc_es.h"
 
-using namespace libmatroska;
-
 avc_es_video_packetizer_c::
 avc_es_video_packetizer_c(generic_reader_c *p_reader,
                           track_info_c &p_ti)
@@ -54,7 +47,7 @@ avc_es_video_packetizer_c::check_if_default_duration_available()
 connection_result_e
 avc_es_video_packetizer_c::can_connect_to(generic_packetizer_c *src,
                                           std::string &error_message) {
-  avc_es_video_packetizer_c *vsrc = dynamic_cast<avc_es_video_packetizer_c *>(src);
+  auto *vsrc = dynamic_cast<avc_es_video_packetizer_c *>(src);
   if (!vsrc)
     return CAN_CONNECT_NO_FORMAT;
 
diff --git a/src/output/p_hevc_es.cpp b/src/output/p_hevc_es.cpp
index f26959edc..bc8fc6ebc 100644
--- a/src/output/p_hevc_es.cpp
+++ b/src/output/p_hevc_es.cpp
@@ -12,18 +12,12 @@
 
 #include "common/common_pch.h"
 
-#include <matroska/KaxTracks.h>
-
 #include "common/codec.h"
 #include "common/hacks.h"
-#include "common/hevc/util.h"
-#include "common/mpeg.h"
+#include "common/hevc/es_parser.h"
 #include "merge/connection_checks.h"
-#include "merge/output_control.h"
 #include "output/p_hevc_es.h"
 
-using namespace libmatroska;
-
 hevc_es_video_packetizer_c::hevc_es_video_packetizer_c(generic_reader_c *p_reader,
                                                        track_info_c &p_ti)
   : avc_hevc_es_video_packetizer_c{p_reader, p_ti, "hevc", std::unique_ptr<mtx::avc_hevc::es_parser_c>(new mtx::hevc::es_parser_c)}