Merge change 27449 into eclair

* changes:
  Always consider m4a files as audio, even when they contain a video track.