Changeset 4223 for branches/1.3/video


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

merge r3919:3920 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/video/RpVideo.c

    r3177 r4223  
    936936    int nrel, nabs, seekFlags, gotframe;
    937937    int64_t nseek;
    938     AVCodecContext *vcodecCtx;
    939938    AVStream *vstreamPtr;
    940939
     
    947946        return -1;
    948947    }
    949     vcodecCtx = vidPtr->pFormatCtx->streams[vidPtr->videoStream]->codec;
    950948
    951949    nabs = n;
     
    15401538{
    15411539    double duration;
    1542     AVCodecContext *vcodecCtx;
    15431540    AVStream *vstreamPtr;
    15441541    AVRational hundred;
     
    15591556    }
    15601557
    1561     vcodecCtx = vidPtr->pFormatCtx->streams[vidPtr->videoStream]->codec;
    15621558    vstreamPtr = vidPtr->pFormatCtx->streams[vidPtr->videoStream];
    15631559
     
    15741570{
    15751571    int frames;
    1576     AVCodecContext *vcodecCtx;
    15771572    AVStream *vstreamPtr;
    15781573    AVRational hundred;
     
    15921587    }
    15931588
    1594     vcodecCtx = vidPtr->pFormatCtx->streams[vidPtr->videoStream]->codec;
    15951589    vstreamPtr = vidPtr->pFormatCtx->streams[vidPtr->videoStream];
    15961590
  • branches/1.3/video/RpVideoTclInterface.cc

    r3177 r4223  
    346346    }
    347347    else {
    348         int c = 0;
    349         c = VideoGoToN((VideoObj *)clientData, val);
     348        VideoGoToN((VideoObj *)clientData, val);
    350349    }
    351350
Note: See TracChangeset for help on using the changeset viewer.