CC: libav-stable@libav.org (cherry picked from committags/n0.6.637ddd38332) Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit9ea94c44b1) Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit08c81f7365) Signed-off-by: Reinhard Tartler <siretart@tauware.de>