kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update and fix FFmpeg, which fixes an MP3 parser crash.

CQTexperiment
Christopher Snowhill 2016-08-05 16:40:48 -07:00
parent a7d1853853
commit 5f8bcf8ff1
7 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Scripts/ffmpeg-build.sh
View File

@ -5,28 +5,23 @@
--disable-ffprobe --disable-ffserver --disable-avdevice --disable-ffmpeg\
--disable-postproc --disable-swresample --disable-avfilter\
--disable-swscale --enable-network --disable-swscale-alpha --disable-vdpau\
--disable-dxva2 --enable-hwaccels\
--disable-encoders --disable-muxers --disable-indevs --disable-outdevs\
--disable-devices --disable-filters --disable-parsers --enable-parser=ac3\
--enable-parser=mpegaudio\
--enable-demuxer=ac3 --disable-bsfs --disable-bzlib --disable-protocols\
--disable-decoders --disable-decoder=libopus --disable-libopus\
--enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2\
--enable-decoder=wmavoice --enable-decoder=wmalossless --enable-decoder=xma1\
--enable-decoder=xma2 --enable-decoder=dca --enable-decoder=ac3\
--disable-decoder=amrnb\
--disable-demuxers --enable-demuxer=asf --enable-demuxer=xwma\
--enable-demuxer=mov --enable-demuxer=oma --enable-demuxer=ac3\
--disable-demuxer=amr --enable-demuxer=ogg\
--enable-demuxer=tak --enable-decoder=tak\
--enable-decoder=dsd_lsbf --enable-decoder=dsd_lsbf_planar\
--enable-decoder=dsd_msbf --enable-decoder=dsd_msbf_planar\
--enable-demuxer=dsf --enable-demuxer=wav\
--disable-dxva2 --disable-everything --enable-hwaccels\
--enable-parser=ac3 --enable-demuxer=ac3 --enable-decoder=ac3\
--enable-parser=mpegaudio --enable-decoder=wmapro --enable-decoder=wmav1\
--enable-decoder=wmav2 --enable-decoder=wmavoice --enable-decoder=wmalossless
--enable-decoder=xma1 --enable-decoder=xma2 --enable-demuxer=asf
--enable-demuxer=xwma --enable-decoder=dca --enable-demuxer=mov\
--enable-demuxer=oma --enable-demuxer=ogg --enable-demuxer=tak\
--enable-decoder=tak --enable-decoder=dsd_lsbf
--enable-decoder=dsd_lsbf_planar --enable-decoder=dsd_msbf
--enable-decoder=dsd_msbf_planar --enable-demuxer=dsf --enable-demuxer=wav\
--enable-demuxer=aac --enable-decoder=aac\
--enable-decoder=atrac3 --enable-decoder=atrac3p\
--enable-demuxer=dts --enable-demuxer=dtshd\
--enable-demuxer=mp3 --enable-decoder=mp3float\
--disable-libopencore-amrnb --disable-libopencore-amrwb\
--disable-version3
--disable-parser=mpeg4video --disable-parser=h263\
--disable-decoder=mpeg2video --disable-decoder=h263 --disable-decoder=h264\
--disable-decoder=mpeg1video --disable-decoder=mpeg2video\
--disable-decoder=mpeg4 --disable-version3
make -j8

2
ThirdParty/ffmpeg/include/libavutil/ffversion.h vendored
View File

@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
#define FFMPEG_VERSION "n3.1.1"
#define FFMPEG_VERSION "n3.1.1-2-g64aba84"
#endif /* AVUTIL_FFVERSION_H */

BIN
ThirdParty/ffmpeg/lib/libavcodec.a vendored
View File

Binary file not shown.

BIN
ThirdParty/ffmpeg/lib/libavformat.a vendored
View File

Binary file not shown.

BIN
ThirdParty/ffmpeg/lib/libavutil.a vendored
View File

Binary file not shown.

2
ThirdParty/ffmpeg/lib/pkgconfig/libavcodec.pc vendored
View File

@ -9,6 +9,6 @@ Version: 57.48.101
Requires: libavutil >= 55.28.100
Requires.private:
Conflicts:
Libs: -L${libdir} -lavcodec -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lz -pthread -framework CoreServices
Libs: -L${libdir} -lavcodec -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices
Libs.private:
Cflags: -I${includedir}

2
ThirdParty/ffmpeg/lib/pkgconfig/libavformat.pc vendored
View File

@ -9,6 +9,6 @@ Version: 57.41.100
Requires: libavcodec >= 57.48.101, libavutil >= 55.28.100
Requires.private:
Conflicts:
Libs: -L${libdir} -lavformat -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lz -pthread -framework CoreServices
Libs: -L${libdir} -lavformat -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices
Libs.private:
Cflags: -I${includedir}