[theora] theora-exp encoder issue

[ZikZak]

Ralph Giles a écrit :
> The theora-exp encoder does not currently work.
>
>   
> Ok it is clear now, I understand why it is not compiled by default.
>
>   
>> I just updated theora and the last modification on encoder_example fails:
>>
>> encoder_example.c: In function 'main':
>> encoder_example.c:806: error: expected expression before '<<' token
>> encoder_example.c:810: error: expected expression before '==' token
>> encoder_example.c:814: error: expected expression before '>>' token
>> make: *** [encoder_example-encoder_example.o] Error 1
>>     
>
> Check your file for a conflict. Or 'svn revert examples/encoder_example.c'
> to throw away your local changes.

I have not changed anything in the file, I've just checked the content 
and there is something weird inside:
ti.keyframe

ti.keyframe_mindistance=8;
<<<<<<< .mine
  ti.noise_sensitivity=2;
  ti.sharpness=2;
 
=======
  ti.noise_sensitivity=noise_sensitivity;
  ti.sharpness=sharpness;

 >>>>>>> .r13791


Long time ago I added ti.noise and ti.sharpness to this file (to save 
some bits).
I removed my personnal values and kept the second data, I hope it is the 
right thing to do.

Thanks for your help.

Best regards
--
ZikZak