Merge branch '2869_mcext_m4a'

* 2869_mcext_m4a:
  Fixed OGV file extention handle.
  Ticket #2869: Added  M4A support
This commit is contained in:
Slava Zanko 2012-08-29 13:03:12 +03:00
commit 4e64456ee2
1 changed files with 3 additions and 3 deletions

View File

@ -426,7 +426,7 @@ include/image
### Sound files ###
regex/i/\.(wav|snd|voc|au|smp|aiff|snd)$
regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a)$
Open=@EXTHELPERSDIR@/sound.sh open common
regex/i/\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$
@ -439,7 +439,7 @@ shell/i/.mp3
Open=@EXTHELPERSDIR@/sound.sh open mp3
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3
regex/i/\.og[gavx]$
regex/i/\.og[gax]$
Open=@EXTHELPERSDIR@/sound.sh open ogg
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg
@ -496,7 +496,7 @@ shell/i/.wmv
regex/i/\.fl[icv]$
Include=video
shell/i/.ogm
regex/i/\.og[mv]$
Include=video
regex/i/\.ra?m$