Apply some fixes for dealing with files without audio or for files where we
want audio dropped. Second case should work this change, first might still
have issues.