libav: bugfix updates for both branches; maintain