Merge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'

* commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4':
  vp9: Add bsf to merge superframes

[14:25:37] <@BBB> the functional change is wrong
[14:25:48] <@BBB> it allows recusrively packing superframes in superframes
[14:26:37] <@BBB> so I would ignore the remainder

See 2e6636aa87303d37b112e79f093ca39500f92364

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/vp9_superframe_bsf.c
index b686adbe1673f564d252a30cff11c5895a9a3b55,be83ba3e75be306e90ef33f6b9df1f2c0c49cc40..98da8d5eba3ba8bb98ba8c8b32e594165fa595b2
--- 1/libavcodec/vp9_superframe_bsf.c
--- 2/libavcodec/vp9_superframe_bsf.c
+++ b/libavcodec/vp9_superframe_bsf.c
@@@ -70,11 -70,12 +70,13 @@@ static int merge_superframe(const struc
          ptr += in[n].size;
      }
  
 -#define wloop(mag, wr) do { \
 +#define wloop(mag, wr) \
-     for (n = 0; n < n_in; n++) { \
-         wr; \
-         ptr += mag + 1; \
-     }
++    do { \
+         for (n = 0; n < n_in; n++) { \
+             wr; \
+             ptr += mag + 1; \
+         } \
+     } while (0)
  
      // write superframe with marker 110[mag:2][nframes:3]
      *ptr++ = marker;