summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2009-07-27 11:36:26 +0000
committerMohamed Tarek <mt@rockbox.org>2009-07-27 11:36:26 +0000
commit320bd1adb84392273b7b713795a6148359395cf7 (patch)
treec521c720361b8eb0e08c45e7ca0fe8d4c28e71cf
parentc393b1dc5c9cfcf4302430af1bcb104fa1628c38 (diff)
downloadrockbox-320bd1adb84392273b7b713795a6148359395cf7.tar.gz
rockbox-320bd1adb84392273b7b713795a6148359395cf7.zip
Fix a bug spotted by Maurus Cuelenaere; rockbox crashed on viewing the porperties of files with unsupported extensions due to the null ext list in
raac. Also add support for audio-only rmvb files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22065 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/filetypes.c1
-rw-r--r--apps/metadata.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 1772cac7ee..210b949578 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -85,6 +85,7 @@ static const struct filetype inbuilt_filetypes[] = {
85 { "sap" ,FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, 85 { "sap" ,FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
86 { "rm", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, 86 { "rm", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
87 { "ra", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, 87 { "ra", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
88 { "rmvb",FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
88#endif 89#endif
89 { "m3u", FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, 90 { "m3u", FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST },
90 { "m3u8",FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, 91 { "m3u8",FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST },
diff --git a/apps/metadata.c b/apps/metadata.c
index 80f2c126e2..d01173737c 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -117,10 +117,10 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
117 AFMT_ENTRY("SAP", "asap", NULL, "sap\0" ), 117 AFMT_ENTRY("SAP", "asap", NULL, "sap\0" ),
118 /* Cook in RM/RA */ 118 /* Cook in RM/RA */
119 [AFMT_COOK] = 119 [AFMT_COOK] =
120 AFMT_ENTRY("Cook", "cook", NULL, "rm\0ra\0" ), 120 AFMT_ENTRY("Cook", "cook", NULL, "rm\0ra\0rmvb\0" ),
121 /* AAC in RM/RA */ 121 /* AAC in RM/RA */
122 [AFMT_RAAC] = 122 [AFMT_RAAC] =
123 AFMT_ENTRY("RAAC", "raac", NULL, NULL ), 123 AFMT_ENTRY("RAAC", "raac", NULL, "rm\0ra\0rmvb\0" ),
124#endif 124#endif
125}; 125};
126 126