[Ffmpeg-cvslog] r8717 - in trunk: configure libavcodec/Makefilelibavcodec/amr.c

[Diego Biurrun]

On Thu, Apr 12, 2007 at 06:13:52PM +0200, Carl Eugen Hoyos wrote:
> On 2007-04-12 10:59, diego wrote:
> > 
> > Modified:
> >    trunk/configure
> >    trunk/libavcodec/Makefile
> >    trunk/libavcodec/amr.c
> > 
> > Log:
> > Replace hackish support for amr-nb and amr-wb. Instead of including the source
> > of the reference implementation it is possible to use proper libraries now.
> > patch by Stanislav Brabec, sbrabec suse cz, changes and bug fixes by me
> 
> Somehow, this patch broke amr for me using mplayer:
> [I needed attached patch to be able to compile mplayer and amr. I linked
> mplayer manually, but the resulting binary crashes when I try my amr
> sample.] -I understand that this is not the intended way anymore, but
> that's how it's still described in amr.c

I'll update that description in a moment.

> Is this still supposed to work by copying amr directories into the
> libavcodec source directoy, or do I have to use
> http://www.penguin.cz/~utx/amr? If yes, this should be mentioned somewhere.

The latter, I've updated the documentation.

> --- libavcodec/amr.c	(Revision 8722)
> +++ libavcodec/amr.c	(Arbeitskopie)
> @@ -36,7 +36,7 @@
>   * \subsection Float
>   * The float version (default) can be downloaded from:
>   * http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
> - * Extract the source into \c "ffmpeg/libavcodec/amr_float".
> + * Extract the source into \c "ffmpeg/libavcodec/amrnb".
>   * Enable it by passing \c "--enable-amr-nb" to \c "./configure".

Even though this may possibly work, this is not a correct fix.  libamrnb
needs to be properly installed.

Diego