Changeset 4224 for branches/1.3/video


Ignore:
Timestamp:
Mar 11, 2014 9:25:44 AM (6 years ago)
Author:
ldelgass
Message:

merge r3926:3929 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/video/RpVideo.c

    r4223 r4224  
    123123static int VideoAllocImgBuffer (VideoObj *vidPtr, int width, int height);
    124124static int VideoFreeImgBuffer (VideoObj *vidPtr);
     125
     126#ifdef notdef
    125127static double VideoTransformFrames2Duration (VideoObj *vidPtr, int frame);
    126128static int VideoTransformDuration2Frames (VideoObj *vidPtr, double duration);
     129#endif
    127130
    128131/*
     
    15211524}
    15221525
     1526#ifdef notdef
    15231527/*
    15241528 * ------------------------------------------------------------------------
     
    15971601    return frames;
    15981602}
     1603#endif
    15991604
    16001605/*
Note: See TracChangeset for help on using the changeset viewer.