359     }
    360
    361 <<<<<<< .mine
    362     NuppelVideoPlayer *nvp = new NuppelVideoPlayer("preview_generator", pginfo);
    363 =======
    364     NuppelVideoPlayer *nvp = new NuppelVideoPlayer(kInUseID, pginfo);
    365 >>>>>>> .r14795
    366     nvp->SetRingBuffer(rbuf);
    367
    368     retbuf = nvp->GetScreenGrabAtFrame(frameNumber, true, bufferLen,
    369                                        frameWidth, frameHeight, frameAspect);