[FFmpeg-devel] [PATCH] riff: don't pad extradata when writing ASF.

[Benoit Fouet]

On Sat, 13 Mar 2010 01:13:46 +0100 Michael Niedermayer wrote:
> On Fri, Mar 12, 2010 at 06:40:26AM +0100, Anton Khirnov wrote:
> > On Thu, Mar 11, 2010 at 09:53:04PM +0100, Michael Niedermayer wrote:
> > > On Thu, Mar 11, 2010 at 09:43:39PM +0100, Anton Khirnov wrote:
> > > > fixes issue1512
> > > > ---
> > > >  libavformat/riff.c |    2 +-
> > > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > > 
> > > > diff --git a/libavformat/riff.c b/libavformat/riff.c
> > > > index 0a3bc95..08001d9 100644
> > > > --- a/libavformat/riff.c
> > > > +++ b/libavformat/riff.c
> > > > @@ -442,7 +442,7 @@ void ff_put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag
> > > >  
> > > >      put_buffer(pb, enc->extradata, enc->extradata_size);
> > > >  
> > > > -    if (enc->extradata_size & 1)
> > > > +    if (!for_asf && enc->extradata_size & 1)
> > > >          put_byte(pb, 0);
> > > 
> > > id suspect the outer size being wrong instead of this
> > > but thats purely guessing, did you try to +1 it ?
> > yes i did, according to a user in #ffmpeg it fixed playback in wmp10 but
> > not wmp11 (<insert m$ joke here>). anyway this padding is not supposed
> > to be here according to ASF specs.
> 
> well if you are sure tis is correct then commit it
> 
> [...]

applied

Ben