[mythtv] [PATCH] viavld interlaced patch. take 2.

[Ivor Hewitt]

On Saturday 02 Oct 2004 14:49, Steven wrote:
> > On Saturday 02 Oct 2004 01:51, Ivor Hewitt wrote:
> >> Minor patch to fix the interlace logic in the xvmc-vld code.
> >
> > And here's the correct patch. :-)
> >
> > Memo to self, don't make patches at 2am.
> >
> > --
> > Ivor Hewitt.
> > http://www.ivor.it - tech | http://www.ivor.org - hedge
>
> Question.
> Did you create the patch against cvs with terry's patches in your tree?
> I'm getting some rejects when I try to apply them (but I do have terry's
> patches applied).

The patch is against clean CVS.

> Another little thing is that it won't build here :-). I'm getting :
> ----------
> vsync.cpp: In member function `virtual void
> DRMVideoSync::WaitForFrame(int)': vsync.cpp:278: error: parse error before
> `<<' token
> vsync.cpp:290: error: parse error before `<<' token
> vsync.cpp:299: error: `n' undeclared (first use this function)
> vsync.cpp:299: error: (Each undeclared identifier is reported only once for
>    each function it appears in.)
> vsync.cpp: At global scope:
> vsync.cpp:305: error: ISO C++ forbids declaration of `KeepPhase' with no
> type vsync.cpp:307: error: parse error before `>>' token
> make[2]: *** [vsync.o] Error 1

The patch (as you can see) doesn't touch vsync.cpp. Something else must be 
broken.
That sounds like you've done a cvs update and it's added "conflict" markers in 
your code. If you look at the file you should see sections with things like:
">>>>>>" and "<<<<<<" around them. 

These are where your tree has conflicted with cvs and you manually need to 
resolve them.

> -----------
>
> I'm using gcc 3.3.4
>
I'm using. 3.4.1. I win. :-)

> If you can answer my first question I'll try a clean cvs checkout.
>

-- 
Ivor Hewitt.
http://www.ivor.it - tech | http://www.ivor.org - hedge