Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-30 15:53:03 +04:00 · 2021-07-10 13:01:03 +00:00
parent 9103837228 167a12028d
commit 9e42e04b4a
5 changed files with 18 additions and 14 deletions
@@ -124,6 +124,7 @@ struct RiffList
    uint32_t m_size;
    uint32_t m_list_type_cc;
 };
+#pragma pack(pop)

 class VideoInputStream
 {
@@ -149,7 +150,6 @@ private:
    String  m_fname;
 };

-#pragma pack(pop)

 inline VideoInputStream& operator >> (VideoInputStream& is, AviMainHeader& avih)
 {