branches

[WarpEnterprises]

@sh0dan: you wrote that you opened a separate "branche" in the cvs for avisynth 2.1.
Can you explain how to see which file is from which branch and generally what a branch is for and when it is supposed to be closed to the main again?
Or is it just as simple that normally the main branch is relevant and the sub-branch is for temporary development only?

[sh0dan]

Not sure I 100% get you there. Here's how I've understood branches work.

At a given time in development, you can split out a seperate branch. I did this with the "avisynth_2_1" brach some time ago.

When you crate a branch, it begins as a complete copy of the main branch, but after that it is held completely seperate from the main branch.

On my HD the 2_1 branch is also 100% seperate from the main branch (in seperate directories).

That means, when I commit something to the "avisynth_2_1" branch, it will not change the main branch, and vice versa (if you change something in the main branch, it'll not show up in the 2_1 branch).

What I've done twice, is merging the main branch into the 2_1 branch - that means merging all changes in the main branch into the 2_1 development branch, this is done 99% automatically by CVS. That means that the 2_1 branch also contains the fixes of the main branch.

In the sourceforge CVS-browser you can choose the 2_1 branch at the bottom of the page.
If you use the tortoise CVS client, you choose branch by holding down control, while selecting "CVS Update".

[WarpEnterprises]

Ok, thx.

[sh0dan]

Regarding the 2_1 branch, it contains most importantly changes to avisynth.h:

- Preliminary Float-point samples, int24 and int32 support. Works quite well, but I still need to convert some functions. Auto-converter works quite ok, even thought there is missing int24 support, and convertion to int8 has problems.
- YV12 support - very early tests - the base seems to work ok, but there is NO supporting code, except for input. Still need some basic work for passing pointers, pitches, etc.
- Cache hints, which I'll change shortly, since the current method isn't good.

Feel free to check it out.

Edit: Forgot to tell you - external plugins are broken, and will probably remain so, even though it should just be a matter of recompiling with the new avisynth.h

[vlad59]

I just did a checkout on the new branch. It's a very good job.

I'll try it tomorrow, can't wait that ;) :sly: ;) :sly:

[sh0dan]

I'll make an official 2.5 alpha announcement soon. I've been working on converting filters and correcting bugs this weekend.