mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
Use bundled FFmpeg for Debian stretch
System FFmpeg does not work with Chromium 67, so use the bundled version for now.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
debian/disable/openh264.patch
|
||||
|
||||
debian_stretch/system/vpx.patch
|
||||
debian_stretch/system/ffmpeg.patch
|
||||
debian_stretch/system/icu.patch
|
||||
|
||||
opensuse/system-libdrm.patch
|
||||
|
||||
@@ -10,9 +10,7 @@ third_party/re2/BUILD.gn
|
||||
third_party/icu/BUILD.gn
|
||||
third_party/flac/BUILD.gn
|
||||
third_party/zlib/BUILD.gn
|
||||
third_party/opus/BUILD.gn
|
||||
third_party/snappy/BUILD.gn
|
||||
third_party/ffmpeg/BUILD.gn
|
||||
third_party/libxml/BUILD.gn
|
||||
third_party/libdrm/BUILD.gn
|
||||
third_party/libpng/BUILD.gn
|
||||
|
||||
@@ -23,7 +23,7 @@ def strip(path):
|
||||
else:
|
||||
os.remove(removal)
|
||||
|
||||
keepers = ('openh264', 'libjpeg', 'harfbuzz-ng')
|
||||
keepers = ('openh264', 'libjpeg', 'harfbuzz-ng', 'ffmpeg', 'opus')
|
||||
|
||||
# strip out regenerating files in each build
|
||||
def remove_file(path):
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
description: changes required to support ffmpeg 3.2 in stretch
|
||||
author: Michael Gilbert <mgilbert@debian.org>
|
||||
|
||||
--- a/media/ffmpeg/ffmpeg_common.cc
|
||||
+++ b/media/ffmpeg/ffmpeg_common.cc
|
||||
@@ -189,8 +189,6 @@ static VideoCodec CodecIDToVideoCodec(AV
|
||||
return kCodecVP8;
|
||||
case AV_CODEC_ID_VP9:
|
||||
return kCodecVP9;
|
||||
- case AV_CODEC_ID_AV1:
|
||||
- return kCodecAV1;
|
||||
default:
|
||||
DVLOG(1) << "Unknown video CodecID: " << codec_id;
|
||||
}
|
||||
@@ -213,8 +211,6 @@ AVCodecID VideoCodecToCodecID(VideoCodec
|
||||
return AV_CODEC_ID_VP8;
|
||||
case kCodecVP9:
|
||||
return AV_CODEC_ID_VP9;
|
||||
- case kCodecAV1:
|
||||
- return AV_CODEC_ID_AV1;
|
||||
default:
|
||||
DVLOG(1) << "Unknown VideoCodec: " << video_codec;
|
||||
}
|
||||
Reference in New Issue
Block a user