mirror of
https://github.com/dslm4515/BMLFS.git
synced 2025-08-20 14:31:47 +00:00
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
|
|
index 97d6307..cede8ac 100644
|
|
--- a/media/ffmpeg/ffmpeg_common.h
|
|
+++ b/media/ffmpeg/ffmpeg_common.h
|
|
@@ -29,7 +29,6 @@ extern "C" {
|
|
#include <libavformat/avformat.h>
|
|
#include <libavformat/avio.h>
|
|
#include <libavutil/avutil.h>
|
|
-#include <libavutil/channel_layout.h>
|
|
#include <libavutil/imgutils.h>
|
|
#include <libavutil/log.h>
|
|
#include <libavutil/mastering_display_metadata.h>
|
|
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
|
|
index 026c0f8..f830ce2 100644
|
|
--- a/media/filters/ffmpeg_demuxer.cc
|
|
+++ b/media/filters/ffmpeg_demuxer.cc
|
|
@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
|
|
|
|
// Next try to use the first DTS value, for codecs where we know PTS == DTS
|
|
// (excludes all H26x codecs). The start time must be returned in PTS.
|
|
- if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
|
|
+ if (stream->first_dts != kNoFFmpegTimestamp &&
|
|
stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
|
|
stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
|
|
stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
|
|
const base::TimeDelta first_pts =
|
|
- ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
|
|
+ ConvertFromTimeBase(stream->time_base, stream->first_dts);
|
|
if (first_pts < start_time)
|
|
start_time = first_pts;
|
|
}
|