Merge remote-tracking branch 'origin/3.6' into 3.7
This commit is contained in:
commit
46360e4821
@ -1,6 +1,7 @@
|
|||||||
untrusted comment: verify with /etc/ports/opt.pub
|
untrusted comment: verify with /etc/ports/opt.pub
|
||||||
RWSE3ohX2g5d/ddRHeKk3uc3xwFbncKYptN+RNi7OT+TQD1fut6aVk84PHpUDKhUucT9sfnG1MfjyIrNM6vZ7024n3UnRTkY9gs=
|
RWSE3ohX2g5d/dsEEAEGzgBDogN9TIVjCjOYC0BNZ62v24VikooZr8sFAuPXI0DekpCcCqaFSAG1Fogp/byzd5oTIPmBuz6zyQ0=
|
||||||
SHA256 (Pkgfile) = 5d92f0e4bcd0885b46592fe864e3cd028a67a2ee7b5b244dee6210ba27a213b2
|
SHA256 (Pkgfile) = 46cafd7d1f1b4e28ef9bea55f4e50fe5a798121820143bef7c79ff6e8722afa7
|
||||||
SHA256 (.footprint) = 93cc038b2af60596e07f1c67e86a45e941602cd888ae555943762c56cfd0a114
|
SHA256 (.footprint) = 93cc038b2af60596e07f1c67e86a45e941602cd888ae555943762c56cfd0a114
|
||||||
SHA256 (ffmpeg-5.1.tar.bz2) = 32b56fb01ce90d452958ae25e91c9564abf49ed5453c127bec23c63e530aa8fa
|
SHA256 (ffmpeg-5.1.1.tar.bz2) = cd0e16f903421266d5ccddedf7b83b9e5754aef4b9f7a7f06ce9e4c802f0545b
|
||||||
|
SHA256 (add-av_stream_get_first_dts-for-chromium.patch) = 57e26caced5a1382cb639235f9555fc50e45e7bf8333f7c9ae3d49b3241d3f77
|
||||||
SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3
|
SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3
|
||||||
|
@ -5,9 +5,10 @@
|
|||||||
# Optional: alsa-lib cuda dav1d fdk-aac nv-codec-headers gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus pulseaudio x264 x265
|
# Optional: alsa-lib cuda dav1d fdk-aac nv-codec-headers gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus pulseaudio x264 x265
|
||||||
|
|
||||||
name=ffmpeg
|
name=ffmpeg
|
||||||
version=5.1
|
version=5.1.1
|
||||||
release=1
|
release=1
|
||||||
source=(https://ffmpeg.org/releases/$name-$version.tar.bz2
|
source=(https://ffmpeg.org/releases/$name-$version.tar.bz2
|
||||||
|
add-av_stream_get_first_dts-for-chromium.patch
|
||||||
ffmpeg-x264-10bit.sh)
|
ffmpeg-x264-10bit.sh)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
@ -42,6 +43,8 @@ build() {
|
|||||||
PKGMK_FFMPEG+=' --enable-openssl --enable-nonfree'
|
PKGMK_FFMPEG+=' --enable-openssl --enable-nonfree'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
patch -Np1 -i $SRC/add-av_stream_get_first_dts-for-chromium.patch
|
||||||
|
|
||||||
./configure ${PKGMK_FFMPEG} \
|
./configure ${PKGMK_FFMPEG} \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
|
@ -1,19 +1,7 @@
|
|||||||
From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001
|
diff '--color=auto' -rupN ffmpeg.orig/libavformat/avformat.h ffmpeg/libavformat/avformat.h
|
||||||
From: "liberato@chromium.org" <liberato@chromium.org>
|
--- ffmpeg.orig/libavformat/avformat.h 2022-08-19 17:42:47.323422603 +0200
|
||||||
Date: Wed, 7 Jul 2021 19:01:22 -0700
|
+++ ffmpeg/libavformat/avformat.h 2022-08-19 17:42:51.347130436 +0200
|
||||||
Subject: [PATCH] Add av_stream_get_first_dts for Chromium
|
@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_g
|
||||||
|
|
||||||
[foutrelis: adjust for new FFStream struct replacing AVStreamInternal]
|
|
||||||
---
|
|
||||||
libavformat/avformat.h | 4 ++++
|
|
||||||
libavformat/utils.c | 7 +++++++
|
|
||||||
2 files changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
|
|
||||||
index cd7b0d941c..b4a6dce885 100644
|
|
||||||
--- a/libavformat/avformat.h
|
|
||||||
+++ b/libavformat/avformat.h
|
|
||||||
@@ -1010,6 +1010,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
|
||||||
*/
|
*/
|
||||||
int64_t av_stream_get_end_pts(const AVStream *st);
|
int64_t av_stream_get_end_pts(const AVStream *st);
|
||||||
|
|
||||||
@ -24,11 +12,10 @@ index cd7b0d941c..b4a6dce885 100644
|
|||||||
#define AV_PROGRAM_RUNNING 1
|
#define AV_PROGRAM_RUNNING 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
diff '--color=auto' -rupN ffmpeg.orig/libavformat/mux_utils.c ffmpeg/libavformat/mux_utils.c
|
||||||
index de7580c32d..0ef0fe530e 100644
|
--- ffmpeg.orig/libavformat/mux_utils.c 2022-08-19 17:42:47.346758108 +0200
|
||||||
--- a/libavformat/utils.c
|
+++ ffmpeg/libavformat/mux_utils.c 2022-08-19 17:47:28.549589002 +0200
|
||||||
+++ b/libavformat/utils.c
|
@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVSt
|
||||||
@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st)
|
|
||||||
return AV_NOPTS_VALUE;
|
return AV_NOPTS_VALUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,6 +26,6 @@ index de7580c32d..0ef0fe530e 100644
|
|||||||
+}
|
+}
|
||||||
+// Chromium: We use the internal field first_dts ^^^
|
+// Chromium: We use the internal field first_dts ^^^
|
||||||
+
|
+
|
||||||
struct AVCodecParserContext *av_stream_get_parser(const AVStream *st)
|
int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
|
||||||
|
int std_compliance)
|
||||||
{
|
{
|
||||||
return st->internal->parser;
|
|
||||||
|
Loading…
Reference in New Issue
Block a user