[FFmpeg-cvslog] r19219 - trunk/libavformat/riff.c

[Diego Biurrun]

On Thu, Jun 18, 2009 at 09:20:28PM +0100, M?ns Rullg?rd wrote:
> darkshikari <subversion at mplayerhq.hu> writes:
> >
> > Log:
> > Add fourcc 0x10000004, seems to actually be MPEG4.  Fixes a problematic AVI file.
> >
> > --- trunk/libavformat/riff.c	Thu Jun 18 20:14:38 2009	(r19218)
> > +++ trunk/libavformat/riff.c	Thu Jun 18 21:31:12 2009	(r19219)
> > @@ -112,6 +112,7 @@ const AVCodecTag codec_bmp_tags[] = {
> >      { CODEC_ID_MPEG1VIDEO,   MKTAG('V', 'C', 'R', '2') },
> >      { CODEC_ID_MPEG1VIDEO,   MKTAG( 1 ,  0 ,  0 ,  16) },
> >      { CODEC_ID_MPEG2VIDEO,   MKTAG( 2 ,  0 ,  0 ,  16) },
> > +    { CODEC_ID_MPEG4,        MKTAG( 4 ,  0 ,  0 ,  16) },
> >      { CODEC_ID_MPEG2VIDEO,   MKTAG('D', 'V', 'R', ' ') },
> >      { CODEC_ID_MPEG2VIDEO,   MKTAG('M', 'M', 'E', 'S') },
> >      { CODEC_ID_MPEG2VIDEO,   MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
> 
> Why didn't you add that after the other MPEG4 tags?  The rule here is
> that tags for the same codec should be grouped together with the
> preferred tag for muxing first in the group.

Maybe the comment at the top of that list could be a bit more explicit.

Diego