Merge pull request #233 from jschueller/chromium

Add chromium patch
conda-forge · Feb 17, 2024 · e4e3865 · e4e3865
2 parents 1c57302 + cb1899e
commit e4e3865
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/.ci_support/migrations/openh264241.yaml b/.ci_support/migrations/openh264241.yaml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -17,7 +17,10 @@ source:
     # https://github.com/conda-forge/ffmpeg-feedstock/pull/193#issuecomment-1484476264
     - patches/0001-Revert-compat-Use-instead-of-for-rc.exe-options.patch
 
-{% set build = 4 %}
+    # needed for qtwebengine
+    - patches/add-av_stream_get_first_dts-for-chromium.patch
+
+{% set build = 5 %}
 {% if license_family == 'gpl' %}
     {% set build = build + 100 %}
 {% endif %}

diff --git a/recipe/patches/add-av_stream_get_first_dts-for-chromium.patch b/recipe/patches/add-av_stream_get_first_dts-for-chromium.patch
@@ -0,0 +1,31 @@
+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);
+
++// 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 '--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;
+ }
+
++// 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)
+ {