summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2010-11-01 06:11:48 +0000
committerDan Fandrich <dan@coneharvesters.com>2010-11-01 06:11:48 +0000
commit883cbb979b586e761196ac34bec26af8cf5d6683 (patch)
tree7d6304e11c3fecba228c351afd23e44fff891f32
parent9b8ff098dc3999051a9c8113f81d74048fdecf4b (diff)
downloadlibgphoto2-883cbb979b586e761196ac34bec26af8cf5d6683.tar.gz
Changed the GP_MIME_AVCHD MIME type to an officially-registered one
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13375 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/directory/directory.c2
-rw-r--r--gphoto2/gphoto2-file.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
index c3d754b16..a57554dbc 100644
--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
@@ -402,7 +402,7 @@ get_info_func (CameraFilesystem *fs, const char *folder, const char *file,
info->file.size = st.st_size;
mime_type = get_mime_type (file);
if (!mime_type)
- mime_type = "application/octet-stream";
+ mime_type = GP_MIME_UNKNOWN;
strcpy (info->file.type, mime_type);
return (GP_OK);
}
diff --git a/gphoto2/gphoto2-file.h b/gphoto2/gphoto2-file.h
index 506818e6c..e89ac714c 100644
--- a/gphoto2/gphoto2-file.h
+++ b/gphoto2/gphoto2-file.h
@@ -53,7 +53,7 @@ extern "C" {
#define GP_MIME_WMA "audio/x-wma"
#define GP_MIME_ASF "audio/x-asf"
#define GP_MIME_MPEG "video/mpeg"
-#define GP_MIME_AVCHD "video/avchd"
+#define GP_MIME_AVCHD "video/mp2t"
/**
* \brief The type of view on the specified file.