[MPlayer-cvslog] r24673 - in trunk: Changelog etc/codecs.conf libmpdemux/demux_lavf.c

[Vladimir Voroshilov]

2007/10/1, Roberto Togni <rxt at rtogni.it>:
> On Mon, 1 Oct 2007 00:20:05 +0700
> "Vladimir Voroshilov" <voroshil at gmail.com> wrote:
>
> > 2007/9/30, Roberto Togni <rxt at rtogni.it>:
> > > On Sun, 30 Sep 2007 05:49:22 +0200 (CEST)
> > > voroshil <subversion at mplayerhq.hu> wrote:
> > >
> > > > Author: voroshil
> > > > Date: Sun Sep 30 05:49:22 2007
> > > > New Revision: 24673
> > > >
> > > > Log:
> > > > AMV demuxer and audio/video decoder
> > > >
> > > [...]
> > > >
> > > > +audiocodec ffadpcmimaamv
> > > > +  info "FFmpeg AMV IMA ADPCM audio"
> > > > +  status working
> > > > +  format 0x01
> > > > +  driver ffmpeg
> > > > +  dll adpcm_ima_amv
> > > > +
> > > [...]
> > >
> > > This is wrong, format 0x01 is pcm. the code should be changed to give
> > > it an internal 4cc ('AMVA') like it's done for AMV video.
> > >
> >
> > Fake AMVA fourcc will work only when format==0x00.
> > But in AMV files format==0x01
> > Fix me if i'm wrong.
> >
>
> That's right, this have to be fixed in the demuxer (setting a
> meaningful 4cc or resetting it to 0), if not possible you have to add a
> special case based on codec id (as done for mpeg4 audio mp4a).

Fix is attached.
FFmpeg's demuxer should not be touched, because format=0x01 is used in
audio stream headers in amv files. Thus i've changed demux_lavf.c.

> Btw are you going to commit also the support for amv to mplayer
> avi demuxer?

Those code was written before FFmpeg's demuxer ;)
Will be sent as separate patch soon.

-- 
Regards,
Vladimir Voroshilov     mailto:voroshil at gmail.com
JID: voroshil at gmail.com, voroshil at jabber.ru
ICQ: 95587719
-------------- next part --------------
A non-text attachment was scrubbed...
Name: amv_fix_codec_tag.diff
Type: text/x-diff
Size: 1128 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/attachments/20071003/ffcf047c/attachment.diff>