Merge change 27449 into eclair

* changes:
  Always consider m4a files as audio, even when they contain a video track.
tree: 4286963535921deb3bf955c990e604bdb1f6f6c0
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE