summaryrefslogtreecommitdiff
path: root/camlibs/canon
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2013-12-01 19:56:17 +0000
committerMarcus Meissner <marcus@jet.franken.de>2013-12-01 19:56:17 +0000
commite49a6f1475553c2dcc1fcd83e04dbbe0dfe1ac69 (patch)
tree75cdaac0544afa0d67be5f5808ac4c66d07694c5 /camlibs/canon
parent8471fe03f3df39c3ef15893c32c9c9ae43a0caef (diff)
downloadlibgphoto2-e49a6f1475553c2dcc1fcd83e04dbbe0dfe1ac69.tar.gz
removed optura 10 duplicate id
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14588 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
-rw-r--r--camlibs/canon/canon.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index d4cb37fef..e4400e65e 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -202,11 +202,8 @@ const struct canonCamModelData models[] = {
{"Canon:MVX150i (normal mode)", CANON_CLASS_1, 0x04A9, 0x3080, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
/* Sighted at
* <http://www.qbik.ch/usb/devices/showdescr.php?id=2232>. */
- {"Canon:Optura 10", CANON_CLASS_1, 0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- {"Canon:MVX100i", CANON_CLASS_1, 0x04A9, 0x3081, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-
-
- {"Canon:Optura 10", CANON_CLASS_1, 0x04A9, 0x3082, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+ {"Canon:MVX100i", CANON_CLASS_1, 0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+ {"Canon:Optura 10", CANON_CLASS_1, 0x04A9, 0x3082, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
{"Canon:EOS 10D", CANON_CLASS_4, 0x04A9, 0x3083, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
{"Canon:EOS 300D (normal mode)", CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
{"Canon:EOS Digital Rebel (normal mode)",CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},