libav: bugfix updates for both branches; maintain

(cherry picked from commit 3fe1656376bc830285bb89b9adbb11a3ad43af40)

Conflicts (0.8 skipped one update):
	pkgs/development/libraries/libav/default.nix