Refactoring, FFmpeg updates

2025-11-03 00:16:05 -05:00
parent 62cd94ca78
commit 1e35910b0a
65 changed files with 2322 additions and 2236 deletions
--- a/src/anm2/animations.h
+++ b/src/anm2/animations.h
@@ -14,9 +14,7 @@ namespace anm2ed::anm2
    Animations() = default;
    Animations(tinyxml2::XMLElement*);
    tinyxml2::XMLElement* to_element(tinyxml2::XMLDocument&);
-    int length();
    void serialize(tinyxml2::XMLDocument&, tinyxml2::XMLElement*);
-    int merge(int, std::set<int>&, types::merge::Type = types::merge::APPEND, bool = true);
-    bool animations_deserialize(const std::string&, int, std::set<int>&, std::string* = nullptr);
+    int length();
  };
 }