[transcode-devel] Aviplit huffyuv files

[Stefan Scheffler]

Hi,

I still idle on the transcode IRC channel. Somebody came on and was
interested in using avisplit to split up large huffyuv files. It didn't
work because some extra data was missing in the headrs of the output
files.

With the attached patch the extra data will be copied to
the output files. It's against 1.1. I'm having trouble building the
default branch, The patach applies and looks ok there, but I couldn't
test it.

stefan

diff -r 1f4472da3313 avilib/avilib.c
--- a/avilib/avilib.c	Tue Apr 27 15:36:38 2010 +0200
+++ b/avilib/avilib.c	Fri Jan 07 14:34:46 2011 +0100
@@ -2254,6 +2254,14 @@
               memcpy(AVI->bitmap_info_header, hdrl_data + i,
                      str2ulong((unsigned char *)&bih.bi_size));
 
+	    
+	    if (str2ulong((unsigned char *)&bih.bi_size) > sizeof(alBITMAPINFOHEADER))
+	    {
+	      uint32_t extradata_size = str2ulong((unsigned char *)&bih.bi_size) - sizeof(alBITMAPINFOHEADER);
+	      AVI->extradata = (void *)(AVI->bitmap_info_header) + sizeof(alBITMAPINFOHEADER);
+	      AVI->extradata_size = extradata_size;
+	    }
+
             AVI->width  = str2ulong(hdrl_data+i+4);
             AVI->height = str2ulong(hdrl_data+i+8);
                     vids_strf_seen = 1;
diff -r 1f4472da3313 tools/avisplit.c
--- a/tools/avisplit.c	Tue Apr 27 15:36:38 2010 +0200
+++ b/tools/avisplit.c	Fri Jan 07 14:34:46 2011 +0100
@@ -340,6 +340,9 @@
 	if (comfile!=NULL)
 	    AVI_set_comment_fd(out, open(comfile, O_RDONLY));
 
+        out->extradata = in->extradata;
+        out->extradata_size = in->extradata_size;
+
         for(k=0; k< AVI_audio_tracks(in); ++k) {
 
           AVI_set_audio_track(in, k);