Changeset 3797 for pjproject/trunk

Timestamp:

Oct 6, 2011 7:11:15 AM (13 years ago)

Author:

ming

Message:

Re #1370: Fixed dshow enumeration device capability.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c

@@ -258 +258 @@
 static void enum_dev_cap(IBaseFilter *filter,
                          pjmedia_dir dir,
-                         const GUID *dshow_format,
+                         const GUID *dshow_fmt,
                          AM_MEDIA_TYPE **pMediatype,
                          IPin **pSrcpin,
@@ -306 +306 @@
                             continue;
 
-                        nformat = (dshow_format? 1:
+                        nformat = (dshow_fmt? 1:
                                    sizeof(dshow_fmts)/sizeof(dshow_fmts[0]));
                         for (j = 0; j < nformat; j++) {
-                            if (!dshow_format || j > 0)
+                            const GUID *dshow_format = dshow_fmt;
+                            
+                            if (!dshow_format)
                                 dshow_format = dshow_fmts[j].dshow_format;
                             if (UuidCompare(&mediatype->subtype,