Merge commit 'c46f886b63772be33c6e6864475140606a79e126' * commit 'c46f886b63772be33c6e6864475140606a79e126': Only scan windows media files when those codecs are enabled.
Merge commit 'c46f886b63772be33c6e6864475140606a79e126' * commit 'c46f886b63772be33c6e6864475140606a79e126': Only scan windows media files when those codecs are enabled.