Merge commit '38f99017e69bd25e88be87117237c29727c25635'
authorClément Bœsch <u@pkh.me>
Mon, 27 Jun 2016 17:54:37 +0000 (19:54 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 27 Jun 2016 17:54:37 +0000 (19:54 +0200)
commite6d0acd4383d9400d3c6f174e3d8abb98ec38818
treee00bc3ca66ffd371d4bdf14761627e4ae5b4cef6
parent85a52a77ce879e2d41056f31730462fcca11c9ae
parent38f99017e69bd25e88be87117237c29727c25635
Merge commit '38f99017e69bd25e88be87117237c29727c25635'

* commit '38f99017e69bd25e88be87117237c29727c25635':
  vp9: Return the correct size when decoding a superframe

This commit is a noop, see c2f3715cb3fce093137591e3005de3e831b1f9fd

Merged-by: Clément Bœsch <u@pkh.me>