Changeset 34396 for branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Sep 5, 2012, 3:54:44 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120805/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSourceIO_CMF.c.in (modified) (1 diff)

branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -399 +399 @@
         @PS1_DV?@  }
 
-        @ALL@                     source->mode  = psMetadataLookupU32 (&status, row, "FLAGS");
-        @>PS1_V2,PS1_SV?,>PS1_DV1@ source->mode2 = psMetadataLookupU32 (&status, row, "FLAGS2");
+        @ALL@                      source->mode       = psMetadataLookupU32 (&status, row, "FLAGS");
+        @>PS1_V2,PS1_SV?,>PS1_DV1@ source->mode2      = psMetadataLookupU32 (&status, row, "FLAGS2");
+        @ALL@                      source->nFrames    = psMetadataLookupU16 (&status, row, "N_FRAMES");
         assert (status);