diff options
| -rw-r--r-- | xbmc/cores/dvdplayer/Codecs/_ffmpeg_with_libvpx_win32.txt | 46 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh | 18 |
2 files changed, 20 insertions, 44 deletions
diff --git a/xbmc/cores/dvdplayer/Codecs/_ffmpeg_with_libvpx_win32.txt b/xbmc/cores/dvdplayer/Codecs/_ffmpeg_with_libvpx_win32.txt index 985589cf37..b2d44ba23e 100644 --- a/xbmc/cores/dvdplayer/Codecs/_ffmpeg_with_libvpx_win32.txt +++ b/xbmc/cores/dvdplayer/Codecs/_ffmpeg_with_libvpx_win32.txt @@ -1,46 +1,12 @@ -How to build ffmpeg with libvpx under mingw
+How to build ffmpeg with libvpx 0.9.1 under mingw
- download http://www.tortall.net/projects/yasm/releases/yasm-0.8.0-win32.exe
- rename it to yasm.exe and put it in your msys/mingw/bin directory
- go to xbmc/cores/dvdplayer/Codecs
-- clone git://review.webmproject.org/libvpx.git to libvpx
+- download http://code.google.com/p/webm/downloads/detail?name=libvpx-0.9.1.zip
+- extract it to libvpx
- cd libvpx
-- run /configure --enable-vp8 --target=x86-win32-gcc
+- run ./configure --enable-vp8 --target=x86-win32-gcc
- run make
-- put the following compile script inside the ffmpeg directory and build as usual:
-
-#!/bin/bash
-rm -r .libs
-make distclean
-
-./configure \
---extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2 -I../libvpx/" \
---extra-ldflags="-L../../../../../system/players/dvdplayer -L../libvpx" \
---enable-shared \
---enable-memalign-hack \
---enable-gpl \
---enable-w32threads \
---enable-postproc \
---enable-zlib \
---enable-libfaad \
---enable-libvpx \
---disable-static \
---disable-altivec \
---disable-muxers \
---disable-encoders \
---disable-debug \
---enable-muxer=spdif \
---enable-muxer=adts \
---enable-encoder=ac3 \
---enable-encoder=aac &&
-
-make -j3 &&
-mkdir .libs &&
-cp lib*/*.dll .libs/ &&
-mv .libs/swscale-0.dll .libs/swscale-0.6.1.dll &&
-cp .libs/avcodec-52.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/avformat-52.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/avutil-50.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/postproc-51.dll ../../../../../system/players/dvdplayer/ &&
-cp .libs/swscale-0.6.1.dll ../../../../../system/players/dvdplayer/ &&
-cp libavutil/avconfig.h include/libavutil/
\ No newline at end of file +- cd ../ffmpeg
+- sh build_xbmc_win32.sh
\ No newline at end of file diff --git a/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh b/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh index 477aa9f9f8..62f706aff9 100644 --- a/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh +++ b/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh @@ -1,10 +1,12 @@ #!/bin/bash +if [ -d .libs ] +then rm -r .libs +fi + make distclean -./configure \ ---extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2" \ ---extra-ldflags="-L../../../../../system/players/dvdplayer" \ +OPTIONS=" --enable-shared \ --enable-memalign-hack \ --enable-gpl \ @@ -20,7 +22,15 @@ make distclean --enable-muxer=spdif \ --enable-muxer=adts \ --enable-encoder=ac3 \ ---enable-encoder=aac && +--enable-encoder=aac" + +if [ -f ../libvpx/libvpx.a ] +then +echo Building with libvpx +OPTIONS="$OPTIONS --enable-libvpx" +fi + +./configure --extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2 -I../libvpx/" --extra-ldflags="-L../../../../../system/players/dvdplayer -L../libvpx" ${OPTIONS} && make -j3 && mkdir .libs && |