Commit 782cc32b authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac: added --with-ffmpeg-faac for when using an ffmpeg which is compiled with faac support.
* modules/stream_out/transcode.c: added mp4a fourcc for MPEG AAC audio transcoding support.
parent f49d0705
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.80 2003/10/02 21:12:45 gbazin Exp $
dnl $Id: configure.ac,v 1.81 2003/10/04 10:54:45 gbazin Exp $
AC_INIT(vlc,0.6.3-cvs)
......@@ -1571,6 +1571,14 @@ then
AX_ADD_LDFLAGS([stream_out_transcode],[])
AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac if ffmpeg has been compiled with faac support],
[
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
AX_ADD_LDFLAGS([stream_out_transcode],[])
AX_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
......
......@@ -2,7 +2,7 @@
* transcode.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: transcode.c,v 1.33 2003/10/03 18:17:55 gbazin Exp $
* $Id: transcode.c,v 1.34 2003/10/04 10:54:45 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -528,6 +528,7 @@ static struct
/* audio */
{ VLC_FOURCC( 'm', 'p', 'g', 'a' ), CODEC_ID_MP2 },
{ VLC_FOURCC( 'm', 'p', '3', ' ' ), CODEC_ID_MP3LAME },
{ VLC_FOURCC( 'm', 'p', '4', 'a' ), CODEC_ID_AAC },
{ VLC_FOURCC( 'a', '5', '2', ' ' ), CODEC_ID_AC3 },
{ VLC_FOURCC( 'a', 'c', '3', ' ' ), CODEC_ID_AC3 },
{ VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment