aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/samidec.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-26 14:38:14 -0300
committerJames Almer <jamrial@gmail.com>2017-10-26 14:39:28 -0300
commit4c0426c478dc452df2a4b4c27cf7622bd0ff4279 (patch)
tree4b947af4cc5247c3d850fa0e0993f3ab4608be6d /libavformat/samidec.c
parentb848eb83479137bbe2c1cc7f8454c20ab7f8fa11 (diff)
parent0cf949a01193dcf6f83fd95d46792dd94479b4e4 (diff)
downloadffmpeg-4c0426c478dc452df2a4b4c27cf7622bd0ff4279.tar.gz
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>
Diffstat (limited to 'libavformat/samidec.c')
0 files changed, 0 insertions, 0 deletions