Contribs: deactivate DxVA2 on Win64

[vlc] / extras / contrib / README

diff --git a/extras/contrib/README b/extras/contrib/README
index f981ec93751d1471cb3ee53e349977b1cbcd3db0..4c45f07fc244825ad6ef9399ebbb8fc8d63594bc 100644 (file)
--- a/extras/contrib/README
+++ b/extras/contrib/README
@@ -10,13 +10,15 @@ You can specify an argument to cross compile, for example:
 This will look for a i586-pc-beos-gcc cross compiler. Default is to
 build natively.
 
+Bootstrap generates your default contrib configuration and puts it in a file
+named 'distro.mak'. Edit this file to fine-tune your preferences for 3rd-party
+libraries that will be build in the contrib system.
+
 Customize config.mak if you need to, then you need to choose between
 building from source (can take a long time but is easily customizable)
 and fetching a pre-compiled binary package. Either type 'make src'
 or 'make bin' (also from the contrib directory).
 
-make bin IS NOT WORKING atm USE make src
-
 Once the contribs are built, you can start building VLC.
 See: http://developers.videolan.org/vlc/osx-compile.html 
 or INSTALL.win32 for more details on that.
@@ -24,16 +26,13 @@ or INSTALL.win32 for more details on that.
 Happy hacking.
 --Meuuh 2003-11-15
 
+Appendix: 
+ I) BUILDING AMR SUPPORT IN FFMPEG
+
+To build ffmpeg with AMR support add HAVE_AMR=1 to config.mak or do:
 
-The following patches have already been sent to the upstream developers:
+echo "HAVE_AMR=1" >> config.mak
 
-ffmpeg-cvs-mactel.patch - split in 5 and sent to ffmpeg-devel@mplayerhq.hu
- o patch-ffmpeg-0b.diff
- o patch-ffmpeg-darwin-support.diff
- o patch-ffmpeg-inline-asm-macros.diff
- o patch-ffmpeg-nop.diff
- o patch-ffmpeg-p2align.diff
-flac-mactel.patch - sent to flac-dev@lists.sourceforge.net
-libdvdnav-mactel.patch - sent to dvd-devel@lists.sourceforge.net
-mpeg2dec.patch - committed upstream, will be in the 0.4.1 release
+and add .libamrwb .libamrnb (before .ffmpeg) to your distro.mak. Then rebuild the contrib with: 
 
+make src