[Ffmpeg-cvslog] r6963 - trunk/libavformat/riff.c

[Oded Shimon]

On Sun, Nov 12, 2006 at 05:31:49PM +0100, Diego Biurrun wrote:
> On Sun, Nov 12, 2006 at 05:22:11PM +0200, Oded Shimon wrote:
> > On Sat, Nov 11, 2006 at 03:08:40AM +0100, Michael Niedermayer wrote:
> > > 
> > > On Sat, Nov 11, 2006 at 01:22:08AM +0000, M?ns Rullg?rd wrote:
> > > > michael <subversion at mplayerhq.hu> writes:
> > > > 
> > > > > Log:
> > > > > libnut uses "MP3 " for mp3
> > > > >
> > > > > Modified: trunk/libavformat/riff.c
> > > > > ==============================================================================
> > > > > --- trunk/libavformat/riff.c	(original)
> > > > > +++ trunk/libavformat/riff.c	Sat Nov 11 01:29:49 2006
> > > > > @@ -200,6 +200,7 @@
> > > > >      // for NuppelVideo (nuv.c)
> > > > >      { CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },
> > > > >      { CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') },
> > > > > +    { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
> > > > 
> > > > Nooooo.  We were trying to get rid of those invalid bogus tags from
> > > > riff.c.  Don't add more of them.
> > > 
> > > nut per spec uses the avi-riff tags to identify codecs, libnut uses
> > > "MP3 " ...
> > > ask oded why
> > 
> > I actually don't know myself. Ask Rich, he told me to do it. :/ BTW, I use 
> > "mp3 " (no caps).
> 
> Fix libnut then?  And I agree that this is confusing.  Does NUT use the
> same identifiers as AVI, 0x55 then, or not?

It used to be 0x55 .

21:02:41 <dalias> if he comes back mention that twocc is not allowed
21:02:56 <dalias> all nut ids must be alphabetic (case?)
21:03:23 <@ods15> really?
21:03:35 <@ods15> cause currently i use \x00\x55 for mp3...
21:03:57 <dalias> mp3 has always been "mp3 "
21:04:31 <@ods15> heh, i (and nutmerge) didn't know...
21:04:51 <dalias> ok fix nutmerge soon :)


When he told me that I figured I just missed some decision that was agreed 
upon during the very long and boring fourcc flamewar which i didn't bother 
reading carefully.

- ods15