[FFmpeg-cvslog] Merge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 26 14:38:14 2017 -0300| [4c0426c478dc452df2a4b4c27cf7622bd0ff4279] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c0426c478dc452df2a4b4c27cf7622bd0ff4279
---

 libavcodec/vp9_superframe_bsf.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c
index b686adbe16..98da8d5eba 100644
--- a/libavcodec/vp9_superframe_bsf.c
+++ b/libavcodec/vp9_superframe_bsf.c
@@ -71,10 +71,12 @@ static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out)
     }
 
 #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;


======================================================================

diff --cc libavcodec/vp9_superframe_bsf.c
index b686adbe16,be83ba3e75..98da8d5eba
--- a/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;