summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--camlibs/directory/directory.c2
-rw-r--r--gphoto2/gphoto2-file.h1
-rw-r--r--libgphoto2/gphoto2-file.c2
3 files changed, 5 insertions, 0 deletions
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
index 9895e40b3..c3d754b16 100644
--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
@@ -86,6 +86,8 @@ static const struct {
{"avi", GP_MIME_AVI},
{"mov", GP_MIME_QUICKTIME},
{"mpg", GP_MIME_MPEG},
+ {"mts", GP_MIME_AVCHD},
+ {"m2ts", GP_MIME_AVCHD},
{"pbm", "image/x-portable-bitmap"},
{"crw", GP_MIME_CRW},
{"cr2", GP_MIME_RAW},
diff --git a/gphoto2/gphoto2-file.h b/gphoto2/gphoto2-file.h
index 58e62ca98..506818e6c 100644
--- a/gphoto2/gphoto2-file.h
+++ b/gphoto2/gphoto2-file.h
@@ -53,6 +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"
/**
* \brief The type of view on the specified file.
diff --git a/libgphoto2/gphoto2-file.c b/libgphoto2/gphoto2-file.c
index 55ecc3590..447b519b2 100644
--- a/libgphoto2/gphoto2-file.c
+++ b/libgphoto2/gphoto2-file.c
@@ -624,6 +624,8 @@ static const char *mime_table[] = {
"ogg", GP_MIME_OGG,
"mpg", GP_MIME_MPEG,
"raw", GP_MIME_RAW,
+ "mts", GP_MIME_AVCHD,
+ "m2ts", GP_MIME_AVCHD,
NULL};
/**
* @param file a #CameraFile