[vlc-devel] [PATCH 00/11] EIA-608 closed captions rendering improvements
dheitmueller at kernellabs.com
Sun Dec 30 00:43:29 CET 2012
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.
The last version I have in my private tree before I started my changes
was on Sep 14.
Can you handle this merge, or do you want me to update to the trunk
and resubmit the patch series?
Devin J. Heitmueller - Kernel Labs
More information about the vlc-devel