highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'

Browse Source 
* 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>
This commit is contained in:
James Almer 2017-10-26 14:38:14 -03:00
commit 4c0426c478
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/vp9_superframe_bsf.c
View File

@ -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;