diff options
| author |  Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
| commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
| tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /etc | |
| parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
| parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
Merge svn changes up to r30643
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 41bc50d559..3f04ac3c3e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4031,6 +4031,13 @@ audiocodec ffwmapro driver ffmpeg dll "wmapro" +audiocodec ffwmavoice + info "WMA Voice audio (FFmpeg)" + status untested + format 0xA + driver ffmpeg + dll "wmavoice" + audiocodec ffmac3 info "Macintosh Audio Compression and Expansion 3:1" status untested |