Merge branch 'rawhide' into epel8

epel8
Than Ngo 1 year ago
commit 7076da9f3b

@ -0,0 +1,16 @@
diff -up chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me chromium-107.0.5304.121/media/filters/audio_file_reader.cc
--- chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me 2022-12-17 08:27:12.204753071 +0100
+++ chromium-107.0.5304.121/media/filters/audio_file_reader.cc 2022-12-17 08:28:40.908211808 +0100
@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
// silence from being output. In the case where we are also discarding some
// portion of the packet (as indicated by a negative pts), we further want to
// adjust the duration downward by however much exists before zero.
- if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
+ if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
const base::TimeDelta pkt_duration = ConvertFromTimeBase(
glue_->format_context()->streams[stream_index_]->time_base,
- frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
+ frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
const base::TimeDelta frame_duration =
base::Seconds(frames_read / static_cast<double>(sample_rate_));

@ -26,6 +26,10 @@
# enable|disble bootstrap
%global bootstrap 0
# workaround for broken gn on epel 8/9
%if 0%{?rhel} == 8 || 0%{?rhel} == 9
%global bootstrap 1
%endif
# Fancy build status, so we at least know, where we are..
# %1 where
@ -349,6 +353,9 @@ Patch111: chromium-116-constexpr.patch
Patch112: chromium-117-el7-default_constructor.patch
# system ffmpeg
# need for old ffmpeg 5.x on epel9 and fedora 37
Patch114: chromium-107-ffmpeg-5.x-duration.patch
# disable the check
Patch115: chromium-107-proprietary-codecs.patch
# drop av_stream_get_first_dts from internal ffmpeg
Patch116: chromium-112-ffmpeg-first_dts.patch
@ -942,6 +949,9 @@ udev.
%endif
%if ! %{bundleffmpegfree}
%if 0%{?rhel} == 9 || 0%{?fedora} == 37
%patch -P114 -p1 -b .ffmpeg-5.x-duration
%endif
%patch -P115 -p1 -b .prop-codecs
%patch -P116 -p1 -b .first_dts
%patch -P117 -p1 -b .sigtrap_system_ffmpeg

Loading…
Cancel
Save