[FFmpeg-devel] [PATCH] fixes in mpeg audio parsing

[Michael Niedermayer]

Hi
On Sun, Nov 16, 2008 at 11:25:41AM +0200, Yoav Steinberg wrote:
> 
> 
> Michael Niedermayer wrote:
> > On Thu, Nov 13, 2008 at 05:15:25PM +0200, Yoav Steinberg wrote:
> >>
> >> Michael Niedermayer wrote:
> >>>> Index: mp3.c
> >>>> ===================================================================
> >>>> --- mp3.c	(revision 15776)
> >>>> +++ mp3.c	(working copy)
> >>>> @@ -402,18 +402,21 @@
> >>>>  /**
> >>>>   * Try to find Xing/Info/VBRI tags and compute duration from info 
> >>>> therein
> >>>>   */
> >>>> -static void mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t 
> >>>> base)
> >>>> +static void mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st)
> >>>>  {
> >>>>      uint32_t v, spf;
> >>>>      int frames = -1; /* Total number of frames in file */
> >>>>      const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
> >>>>      MPADecodeContext c;
> >>>> +    int vbrtag_size = 0;
> >>>> +    int64_t base = url_ftell(s->pb);
> >>>>       v = get_be32(s->pb);
> >>>>      if(ff_mpa_check_header(v) < 0)
> >>>>        return;
> >>> a return here will randomize the file position, and similarly will
> >>> for other returns
> >> take 2.
> > 
> > patch ok if it passes regession tests and has been tested with a mp3 with
> > VBRI tag
> > 
> It was tested with a VBRI tagged mp3. Regarding regression tests I'm not 
> sure what you mean. The project did pass a 'make test' successfully.

applied

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Observe your enemies, for they first find out your faults. -- Antisthenes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090104/a87e2034/attachment.pgp>