[MPlayer-dev-eng] Re: [PATCH] ODML padding bug fix

[Tobias Diedrich]

Frédéric Dupuis wrote:
> This quick patch fixes a nasty bug in the new ODML AVI muxer: the
> previous version sometimes padded a full GB of junk whenever the
> position reached a multiple of ODML_CHUNKLEN.

This should fix it (forgot to round len up to word boundaries).
I'll wait with this one until the aspect fix is applied.

Index: libmpdemux/muxer_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v
retrieving revision 1.20
diff -u -r1.20 muxer_avi.c
--- libmpdemux/muxer_avi.c	21 Mar 2004 21:32:54 -0000	1.20
+++ libmpdemux/muxer_avi.c	23 Mar 2004 15:51:55 -0000
@@ -207,7 +207,7 @@
     s->size+=len;
     if((unsigned int)len>s->h.dwSuggestedBufferSize) s->h.dwSuggestedBufferSize=len;
 
-    muxer->file_end += len + 8;
+    muxer->file_end += len + len&1 + 8;
 }
 
 static void write_avi_list(FILE *f,unsigned int id,int len){

-- 
Tobias						PGP: http://9ac7e0bc.2ya.com
This mail is made of 100% recycled bits.