[MPlayer-dev-eng] [PATCH] libmpdemux/demux_audio: Skip ID3v2.4 tags.

Reimar Döffinger Reimar.Doeffinger at gmx.de
Mon Feb 13 20:39:48 CET 2012


On Fri, Feb 03, 2012 at 08:29:38PM +0100, Benoît Thébaudeau wrote:
> Reimar,
> 
> > > diff -Nrdup mplayer.orig/libmpdemux/demux_audio.c
> > > mplayer/libmpdemux/demux_audio.c
> > > --- mplayer.orig/libmpdemux/demux_audio.c	2012-01-27
> > > 13:42:31.522983827 +0100
> > > +++ mplayer/libmpdemux/demux_audio.c	2012-01-27 13:55:08.946980169
> > > +0100
> > > @@ -441,12 +441,12 @@ static int demux_audio_open(demuxer_t* d
> > >      free(mp3_found);
> > >      mp3_found = NULL;
> > >      if(s->end_pos && (s->flags & MP_STREAM_SEEK) ==
> > >      MP_STREAM_SEEK) {
> > > -      stream_seek(s,s->end_pos-128);
> > > +      stream_seek(s,demuxer->movi_end-128);
> >
> > Semantics-wise, it doesn't really make sense to check
> > for s->end_pos but then use demuxer->movi_end.
> > Also I realize that it would probably make sense to check
> > for it >/>= 128.
> 
> Done in the attached patch.
> 
> I have also attached the same patch merged with the previous one if you prefer
> a single patch for these changes.

I applied the others, but I'd need this one without the reindentation
because it's not really possibly to review like this.
-uwb as extra options to diff would probably work (obviously I could do
that on my own, but that might take a bit longer till I get round to it).


More information about the MPlayer-dev-eng mailing list