Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: garbage => upstream

Browse Source 
"garbage" is considered offensive. The result will still be pretty bad
though (currently build failures).
This commit is contained in:
wm4
2017-11-01 18:19:06 +01:00
parent a7a1ae0b3d
commit 27ab99dc3e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wscript
View File

@@ -464,7 +464,7 @@ libav_dependencies = [
'int x[LIBAVCODEC_MPV ? 1 : -1]', 'int x[LIBAVCODEC_MPV ? 1 : -1]',
use='libavcodec') use='libavcodec')
}, { }, {
'name': '--ffmpeg-garbage', 'name': '--ffmpeg-upstream',
'deps': '!ffmpeg-mpv', 'deps': '!ffmpeg-mpv',
'desc': 'libav* is upstream FFmpeg (unsupported)', 'desc': 'libav* is upstream FFmpeg (unsupported)',
# FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100 # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100
@@ -485,7 +485,7 @@ libav_dependencies = [
}, { }, {
'name': 'libav-any', 'name': 'libav-any',
'desc': 'Libav/FFmpeg library versions', 'desc': 'Libav/FFmpeg library versions',
'deps': 'ffmpeg-mpv || ffmpeg-garbage || libav', 'deps': 'ffmpeg-mpv || ffmpeg-upstream || libav',
'func': check_ffmpeg_or_libav_versions(), 'func': check_ffmpeg_or_libav_versions(),
'req': True, 'req': True,
'fmsg': "Unable to find development files for some of the required \ 'fmsg': "Unable to find development files for some of the required \