ffmpeg: 6.0

This commit is contained in:
Owen Rafferty 2023-03-11 16:02:44 -06:00
parent 4b3c2a80f3
commit aebab6d721
No known key found for this signature in database
4 changed files with 11 additions and 15 deletions

View File

@ -1,2 +1,2 @@
69fddb793c6b4fb6fd1093e54c8228c3c498614be3e48c311bb3f609a12daf5f5f
258454e4c47cd21c00528ff536fa263c06fce69ea59c9a09a908cc6f72ae060b4e
4879074c357102f85932673044c57c144b0c188ae58edec2a115965536ee340f5e
4f16712641b400498753572c0f2d1e30f28fa0df0ea8d0bd2da9d2d74f6613b3ee

View File

@ -1,32 +1,28 @@
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f12fa7d..0b9fd1f 100644
index 1916aa2..43aa2dd 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
*/
@@ -1019,6 +1019,8 @@ attribute_deprecated
int64_t av_stream_get_end_pts(const AVStream *st);
#endif
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st);
+// Chromium: We use the internal field first_dts ^^^
+
#define AV_PROGRAM_RUNNING 1
/**
diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c
index eb8ea3d..8420934 100644
index 3e63b80..758d985 100644
--- a/libavformat/mux_utils.c
+++ b/libavformat/mux_utils.c
@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVStream *st)
return AV_NOPTS_VALUE;
@@ -40,6 +40,11 @@ int64_t av_stream_get_end_pts(const AVStream *st)
}
#endif
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st)
+{
+ return cffstream(st)->first_dts;
+}
+// Chromium: We use the internal field first_dts ^^^
+
int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
int std_compliance)

View File

@ -1,2 +1,2 @@
https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz
https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz
patches/add-av_stream_get_first_dts-for-chromium.patch

View File

@ -1 +1 @@
5.1.2 2
6.0 1