[vlc-devel] [PATCH 00/11] EIA-608 closed captions rendering improvements

[Rafaël Carré]

Le 30/12/2012 00:43, Devin Heitmueller a écrit :
> On Sat, Dec 29, 2012 at 6:34 PM, Rafaël Carré <funman at videolan.org> wrote:
>> I tried to apply the first ones but they do not apply:
>>
>> From patch 0002:
>>
>> diff --git a/modules/codec/cc.c b/modules/codec/cc.c
>> index e9590bc..86ec51e 100644
>> --- a/modules/codec/cc.c
>> +++ b/modules/codec/cc.c
>> @@ -1098,9 +1098,6 @@ static char *Eia608Text( eia608_t *h, bool b_html )
>>
>> e9590bc does not exist,
>> cc.c is 1094 lines in git so the hunk can't start at line 1098..
>>
>> Is it based on previous patches?
> 
> The work was started back in October, and it looks like there has been
> some drift on cc.c and a rebase will be required.
> 
> http://git.videolan.org/?p=vlc.git;a=history;f=modules/codec/cc.c;h=34777e57278e1950130880885bd1011df3366880;hb=3f89be63d4e71e54342ef268b6b585877b92c9f6
> 
> The last version I have in my private tree before I started my changes
> was on Sep 14.
> 
> http://git.videolan.org/?p=vlc.git;a=commit;h=0e044faad3d30ed002e9bfeca0b0f30a36b27b0e
> 
> Can you handle this merge, or do you want me to update to the trunk
> and resubmit the patch series?

I'll see if I can merge it with the pointers you gave me.

Whatever the issue I'll get back to you, and maybe before I do it we'll
have some comments from Laurent :)