[arch-commits] Commit in ffmpeg/trunk (2 files)

[Maxime Gauduin]

    Date: Friday, August 19, 2022 @ 16:00:20
  Author: alucryd
Revision: 454050

upgpkg: ffmpeg 2:5.1-1

Modified:
  ffmpeg/trunk/PKGBUILD
  ffmpeg/trunk/add-av_stream_get_first_dts-for-chromium.patch

------------------------------------------------+
 PKGBUILD                                       |   17 ++++-------
 add-av_stream_get_first_dts-for-chromium.patch |   33 ++++++-----------------
 2 files changed, 16 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-19 15:37:58 UTC (rev 454049)
+++ PKGBUILD	2022-08-19 16:00:20 UTC (rev 454050)
@@ -5,8 +5,8 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 
 pkgname=ffmpeg
-pkgver=5.0.1
-pkgrel=3
+pkgver=5.1
+pkgrel=1
 epoch=2
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=(x86_64)
@@ -97,22 +97,17 @@
 options=(
   debug
 )
-_tag=9687cae2b468e09e35df4cea92cc2e6a0e6c93b3
+_tag=e0723b7e4e22492275d476fcd30d759e1198bc5b
 source=(
   git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
-  ffmpeg-vmaf2.x.patch
   add-av_stream_get_first_dts-for-chromium.patch
 )
-b2sums=(
-  SKIP
-  65039aac811bfd143359e32720cd6ca64124f1789c1b624bd28a5bd75b37362b2a3b6b402203c4e9d137fb1d00895114f3789df40f8381091d38c98e7876cc8a
-  3f2ee7606500fa9444380d138959cd2bccfbba7d34629a17f4f6288c6bde29e931bbe922a7c25d861f057ddd4ba0b095bbd675c1930754746d5dd476b3ccbc13
-)
+b2sums=('SKIP'
+        '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
 
 prepare() {
   cd ffmpeg
-  git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus
-  patch -Np1 -i ../ffmpeg-vmaf2.x.patch # vmaf 2.x support
+  git cherry-pick -n e0723b7e4e22492275d476fcd30d759e1198bc5b # remove default IPFS gateway
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
 }
 

Modified: add-av_stream_get_first_dts-for-chromium.patch
===================================================================
--- add-av_stream_get_first_dts-for-chromium.patch	2022-08-19 15:37:58 UTC (rev 454049)
+++ add-av_stream_get_first_dts-for-chromium.patch	2022-08-19 16:00:20 UTC (rev 454050)
@@ -1,19 +1,7 @@
-From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001
-From: "liberato at chromium.org" <liberato at chromium.org>
-Date: Wed, 7 Jul 2021 19:01:22 -0700
-Subject: [PATCH] Add av_stream_get_first_dts for Chromium
-
-[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);
+diff '--color=auto' -rupN ffmpeg.orig/libavformat/avformat.h ffmpeg/libavformat/avformat.h
+--- ffmpeg.orig/libavformat/avformat.h	2022-08-19 17:42:47.323422603 +0200
++++ ffmpeg/libavformat/avformat.h	2022-08-19 17:42:51.347130436 +0200
+@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_g
   */
  int64_t    av_stream_get_end_pts(const AVStream *st);
  
@@ -24,11 +12,10 @@
  #define AV_PROGRAM_RUNNING 1
  
  /**
-diff --git a/libavformat/utils.c b/libavformat/utils.c
-index de7580c32d..0ef0fe530e 100644
---- a/libavformat/utils.c
-+++ b/libavformat/utils.c
-@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st)
+diff '--color=auto' -rupN ffmpeg.orig/libavformat/mux_utils.c ffmpeg/libavformat/mux_utils.c
+--- ffmpeg.orig/libavformat/mux_utils.c	2022-08-19 17:42:47.346758108 +0200
++++ ffmpeg/libavformat/mux_utils.c	2022-08-19 17:47:28.549589002 +0200
+@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVSt
          return AV_NOPTS_VALUE;
  }
  
@@ -39,6 +26,6 @@
 +}
 +// 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;