[FFmpeg-devel] [PATCH] Using struct for StyleRecords and implementing support for large boxes(>32 bit) for 3gpp timed text

[Niklesh Lalwani]

On Sun, Apr 26, 2015 at 6:56 AM, Michael Niedermayer <michaelni at gmx.at>
> wrote:
>
>>
>> > +struct __attribute__((__packed__)) StyleRecord {
>
>
>> you cant do this
>
> attribute packed is not ANSI/ISO C
>
>
>> How do I implement packed structures then here? ( since I don't want
padding for proper alignment with the text sample)

>
>> also the patch doesnt apply
>
>
>> Applying: Using struct for StyleRecords and implementing support for
>> large boxes(>32 bit) for 3gpp timed text
>
> fatal: sha1 information is lacking or useless (libavcodec/movtextdec.c).
>
> Repository lacks necessary blobs to fall back on 3-way merge.
>
> Cannot fall back to three-way merge.
>
> Patch failed at 0001 Using struct for StyleRecords and implementing
>> support for large boxes(>32 bit) for 3gpp timed text
>
> When you have resolved this problem run "git am --resolved".
>
> If you would prefer to skip this patch, instead run "git am --skip".
>
> To restore the original branch and stop patching run "git am --abort".
>
>
What does this mean? Probably creating patch again would solve this. I will
post one after working on improvements over this patch.