On Sun, Apr 26, 2015 at 05:31:21AM +0530, Niklesh Lalwani wrote: > From: Niklesh <niklesh.lalw...@iitb.ac.in> > > This patch uses struct for the Style Records. The pointer to this struct is > updated to point to the start of style records in the TextStyleModifierBox. > However, in doing this, I get a warning for incompatible pointer type > assignment. How to get over this? The patch gives proper outputs though. > > Also, I have added support for large boxes(>32 bit) as per the ISO base media > file format. Please let me know if I am doing it wrong. > > Signed-off-by: Niklesh <niklesh.lalw...@iitb.ac.in> > --- > libavcodec/movtextdec.c | 83 > ++++++++++++++++++++----------------------------- > 1 file changed, 33 insertions(+), 50 deletions(-) > > diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c > index ab4efdb..7eb41b8 100644 > --- a/libavcodec/movtextdec.c > +++ b/libavcodec/movtextdec.c > @@ -31,20 +31,28 @@ > #define STYLE_FLAG_ITALIC 2 > #define STYLE_FLAG_UNDERLINE 4 >
> +struct __attribute__((__packed__)) StyleRecord {
you cant do this
attribute packed is not ANSI/ISO C
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".
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Old school: Use the lowest level language in which you can solve the problem
conveniently.
New school: Use the highest level language in which the latest supercomputer
can solve the problem without the user falling asleep waiting.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
