summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Figuiere <hub@figuiere.net>2006-06-05 16:48:03 +0000
committerHubert Figuiere <hub@figuiere.net>2006-06-05 16:48:03 +0000
commit6648d06ac0b5a56bcbef16049d936e96de3339c0 (patch)
tree5b9446eade8335771f5710de62a2952af2e4ed84
parentfbb0aac00b18e94bf7768e1b292e11c6bce52a08 (diff)
downloadlibgphoto2-6648d06ac0b5a56bcbef16049d936e96de3339c0.tar.gz
* directory.c: Added more extensions as file types.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_2/libgphoto2@8839 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/directory/ChangeLog4
-rw-r--r--camlibs/directory/directory.c8
2 files changed, 11 insertions, 1 deletions
diff --git a/camlibs/directory/ChangeLog b/camlibs/directory/ChangeLog
index 3c3ef2dff..1bc5f5146 100644
--- a/camlibs/directory/ChangeLog
+++ b/camlibs/directory/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-03 Hubert Figuiere <hub@figuiere.net>
+
+ * directory.c: Added more extensions as file types.
+
2005-08-17 Marcus Meissner <marcus@jet.franken.de>
* directory.c: Use "Mass Storage Camera" to avoid
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
index d4a672361..219ce6541 100644
--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
@@ -67,8 +67,14 @@ static const struct {
{"pgm", GP_MIME_PGM},
{"avi", GP_MIME_AVI},
{"mov", GP_MIME_QUICKTIME},
+ {"mpg", GP_MIME_MPEG},
{"pbm", "image/x-portable-bitmap"},
- {"crw", GP_MIME_RAW},
+ {"crw", GP_MIME_CRW},
+ {"cr2", GP_MIME_RAW},
+ {"nef", GP_MIME_RAW},
+ {"mrw", GP_MIME_RAW},
+ {"dng", GP_MIME_RAW},
+ {"sr2", GP_MIME_RAW},
{"png", GP_MIME_PNG},
{"wav", GP_MIME_WAV},
{NULL, NULL}