Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
34ba8bd4
Commit
34ba8bd4
authored
Jul 10, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Faac is NOT compatible with VLC
Too bad for your AAC encoding, but, well.
parent
f4180b54
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
7 additions
and
28 deletions
+7
-28
extras/contrib/src/Distributions/beos.mak
extras/contrib/src/Distributions/beos.mak
+1
-1
extras/contrib/src/Distributions/darwin.mak
extras/contrib/src/Distributions/darwin.mak
+1
-1
extras/contrib/src/Distributions/debian.mak
extras/contrib/src/Distributions/debian.mak
+1
-1
extras/contrib/src/Distributions/fedora.mak
extras/contrib/src/Distributions/fedora.mak
+1
-1
extras/contrib/src/Distributions/unix.mak
extras/contrib/src/Distributions/unix.mak
+1
-1
extras/contrib/src/Distributions/win32.mak
extras/contrib/src/Distributions/win32.mak
+1
-1
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-20
extras/contrib/src/packages.mak
extras/contrib/src/packages.mak
+0
-2
No files found.
extras/contrib/src/Distributions/beos.mak
View file @
34ba8bd4
...
...
@@ -3,7 +3,7 @@ ifeq ($(HOST),$(BUILD))
# Native build: we need perl, autoconf, etc first
all
:
.perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi
\
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora
\
.flac .speex .faad .
faac .
lame .ebml .matroska .ffmpeg .dvdcss
\
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss
\
.dvdnav .dvbpsi .dca .aclocal
#.speex seems
else
...
...
extras/contrib/src/Distributions/darwin.mak
View file @
34ba8bd4
# Darwin rules
all
:
.autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype
\
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora
\
.flac .speex .shout .faad .
faac .
lame .twolame .ebml .matroska .ffmpeg
\
.flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg
\
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig
\
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager
\
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder
\
...
...
extras/contrib/src/Distributions/debian.mak
View file @
34ba8bd4
# Debian Linux
all
:
.iconv .intl .freetype .fribidi .zlib
\
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora
\
.flac .speex .faad .
faac .
lame .ebml .matroska .ffmpeg .dvdcss
\
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss
\
.live .goom2k4 .caca .mod .x264 .xml .twolame
\
.png .gpg-error .gcrypt .gnutls .mpcdec
\
.dvdnav .dvbpsi .dirac
\
...
...
extras/contrib/src/Distributions/fedora.mak
View file @
34ba8bd4
# Fedora Linux rules
# Most dependencies are available from livna repro.
all
:
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora
\
.flac .speex .faad .
faac .
lame .ebml .matroska .ffmpeg
\
.flac .speex .faad .lame .ebml .matroska .ffmpeg
\
.live .goom2k4 .caca .mod .x264 .xml .twolame
\
.mpcdec
\
.dvbpsi .dirac .schroedinger
\
...
...
extras/contrib/src/Distributions/unix.mak
View file @
34ba8bd4
# Standard Linux or other UNIX-like systems
all
:
.iconv .intl .freetype .fribidi .zlib
\
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora
\
.flac .speex .faad
.faac
.lame .ebml .matroska .ffmpeg .dvdcss
\
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss
\
.live .goom2k4 .caca .mod .x264 .xml .twolame
\
.png .gpg-error .gcrypt .gnutls .mpcdec
\
.dvdnav .dvbpsi .dirac
\
...
...
extras/contrib/src/Distributions/win32.mak
View file @
34ba8bd4
# WIN32 rules
all
:
.iconv .intl .freetype .fribidi .zlib
\
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora
\
.flac .speex .faad .
faac .
lame .ebml .matroska .ffmpeg .dvdcss
\
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss
\
.live .pthreads .goom2k4 .caca .mod .x264 .xml .twolame
\
.png .gpg-error .gcrypt .gnutls .mpcdec
\
.dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image
\
...
...
extras/contrib/src/Makefile
View file @
34ba8bd4
...
...
@@ -148,7 +148,6 @@ ifdef HAVE_DARWIN_OS
X264CONF
+=
--enable-pic
FFMPEGCONF
+=
--cc
=
$(CC)
FFMPEGCONF
+=
--arch
=
$(ARCH)
FFMPEGCONF
+=
--disable-libfaac
ifdef
HAVE_DARWIN_10
FFMPEGCONF
+=
--cpu
=
core2
X264CONF
+=
--host
=
x86_64-apple-darwin10
...
...
@@ -921,24 +920,6 @@ CLEAN_FILE += .faad
CLEAN_PKG
+=
faad2
DISTCLEAN_PKG
+=
faad2-
$(FAAD2_VERSION)
.tar.gz
# ***************************************************************************
# faac
# ***************************************************************************
faac-$(FAAC_VERSION).tar.gz
:
$(WGET)
$(FAAC_URL)
faac
:
faac-$(FAAC_VERSION).tar.gz
$(EXTRACT_GZ)
.faac
:
faac
(
cd
$<
;
./bootstrap
&&
$(HOSTCC)
./configure
$(HOSTCONF)
--without-mp4v2
--prefix
=
$(PREFIX)
--disable-shared
&&
make
&&
make
install
)
touch
$@
CLEAN_FILE
+=
.faac
CLEAN_PKG
+=
faac
DISTCLEAN_PKG
+=
faac-
$(FAAC_VERSION)
.tar.gz
# ***************************************************************************
# lame
# ***************************************************************************
...
...
@@ -1129,7 +1110,7 @@ else
ifdef
HAVE_UCLIBC
.ffmpeg
:
ffmpeg
else
.ffmpeg
:
ffmpeg .
faac .
lame .gsm
.ffmpeg
:
ffmpeg .lame .gsm
endif
endif
(
cd
$<
;
$(HOSTCC)
./configure
$(FFMPEGCONF)
--prefix
=
$(PREFIX)
--extra-cflags
=
"
$(CFLAGS)
$(FFMPEG_CFLAGS)
-DRUNTIME_CPUDETECT"
--extra-ldflags
=
"
$(LDFLAGS)
"
$(FFMPEGCONF)
--disable-shared
--enable-static
&&
make
&&
make install-libs install-headers
)
...
...
extras/contrib/src/packages.mak
View file @
34ba8bd4
...
...
@@ -86,8 +86,6 @@ FAAD2_VERSION=2.7
FAAD2_URL
=
$(SF)
/faac/faad2-
$(FAAD2_VERSION)
.tar.gz
#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT
=
:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
FAAC_VERSION
=
1.28
FAAC_URL
=
$(SF)
/faac/faac-
$(FAAC_VERSION)
.tar.gz
LAME_VERSION
=
398-2
LAME_URL
=
$(SF)
/lame/lame-
$(LAME_VERSION)
.tar.gz
LIBEBML_VERSION
=
0.7.8
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment