Changeset 5979


Ignore:
Timestamp:
03/01/10 14:23:10 (10 years ago)
Author:
melissa
Message:

A few more QuickTime fixes.

Location:
trunk/components/bio-formats/src/loci/formats
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/NativeQTReader.java

    r5978 r5979  
    555555        } 
    556556        else if (atomType.equals("stts")) { 
    557           in.skipBytes(10); 
     557          in.skipBytes(12); 
    558558          int fps = in.readInt(); 
    559559          addGlobalMeta("Frames per second", fps); 
  • trunk/components/bio-formats/src/loci/formats/out/QTWriter.java

    r5978 r5979  
    194194    } 
    195195    int nChannels = samples == null ? 1 : samples.intValue(); 
    196     int pad = (4 - (width % 4)) % 4; 
     196    int pad = nChannels > 1 ? 0 : (4 - (width % 4)) % 4; 
    197197 
    198198    if (!initialized) { 
     
    537537      DataTools.writeInt(out, 1, false); // number of entries in the table 
    538538      DataTools.writeInt(out, numWritten, false); // number of planes 
    539       DataTools.writeInt(out, (timeScale / fps), false); // frames per second 
     539      DataTools.writeInt(out, fps, false); // frames per second 
    540540 
    541541      // -- write stsc atom -- 
Note: See TracChangeset for help on using the changeset viewer.