revert: remove non-ATX changes from #223 merge

libs/hwcodec/cpp/common/platform/linux/linux.cpp

@@ -169,12 +169,12 @@ int linux_support_v4l2m2m() {
   // /dev/video2 - Alternate path
   // /dev/video32 - Some Allwinner/Rockchip legacy
   const char *m2m_devices[] = {
-      "/dev/video10",
-      "/dev/video11",
-      "/dev/video0",
-      "/dev/video1",
-      "/dev/video2",
-      "/dev/video32",
+    "/dev/video10",
+    "/dev/video11",
+    "/dev/video0",
+    "/dev/video1",
+    "/dev/video2",
+    "/dev/video32",
   };
 
   for (size_t i = 0; i < sizeof(m2m_devices) / sizeof(m2m_devices[0]); i++) {

libs/hwcodec/cpp/common/util.cpp

@@ -10,19 +10,11 @@ extern "C" {
 
 #include "common.h"
 
+#include "common.h"
+
 #define LOG_MODULE "UTIL"
 #include "log.h"
 
-#ifndef FF_PROFILE_H264_BASELINE
-#define FF_PROFILE_H264_BASELINE 66
-#endif
-#ifndef FF_PROFILE_H264_HIGH
-#define FF_PROFILE_H264_HIGH 100
-#endif
-#ifndef FF_PROFILE_HEVC_MAIN
-#define FF_PROFILE_HEVC_MAIN 1
-#endif
-
 namespace {
 
 // Helper function: check if encoder is software H264 (libx264)

libs/hwcodec/cpp/ffmpeg_ram/ffmpeg_ram_decode.cpp

@@ -55,11 +55,7 @@ public:
     callback_ = callback;
 
     if (name_.find("rkmpp") != std::string::npos) {
-#ifdef AV_HWDEVICE_TYPE_RKMPP
       hw_device_type_ = AV_HWDEVICE_TYPE_RKMPP;
-#else
-      set_last_error("RKMPP support not compiled in FFmpeg");
-#endif
     }
   }