This is similar to committags/n2.8.99ac61e73d0. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit0edd569466) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>