Merge pull request #20373 from kikaxa:mjpeg-VideoInputStream-alignment-fix

2021-07-07 18:21:57 +00:00 · 2021-07-07 18:21:57 +00:00 · 4788de784b
commit 4788de784b
parent 9a9954a036 926535469d
1 changed files with 1 additions and 1 deletions
--- a/modules/videoio/src/container_avi.cpp
+++ b/modules/videoio/src/container_avi.cpp
@ -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)
 {