Merge pull request #229 from regro-cf-autotick-bot/6.1.1_hdb13ac

ffmpeg v6.1.1
conda-forge · Dec 31, 2023 · 1d1ccf1 · 1d1ccf1
2 parents 8bf3088 + 0aa1816
commit 1d1ccf1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/.ci_support/migrations/svt_av1180.yaml b/.ci_support/migrations/svt_av1180.yaml
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "6.1.0" %} # semver: (x.y.z)
+{% set version = "6.1.1" %} # semver: (x.y.z)
 {% set x,y,z = version.split('.') %}
 {% set version_ffmpeg_style = x ~ '.' ~ y if z == "0" else version %}
 
@@ -8,7 +8,7 @@ package:
 
 source:
   url: https://ffmpeg.org/releases/ffmpeg-{{ version_ffmpeg_style }}.tar.gz
-  sha256: 938dd778baa04d353163ca5cb06c909c918850055f549205b29b1224e45a5316
+  sha256: b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb
   patches:
     - patches/pkgconfig_generate_windows_llvm.patch  # [win]
     # I don't really think that the original changes made at FFmpeg make sense for
@@ -17,7 +17,7 @@ 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 = 5 %}
+{% set build = 0 %}
 {% if license_family == 'gpl' %}
     {% set build = build + 100 %}
 {% endif %}
@@ -80,7 +80,7 @@ requirements:
     - libxcb       # [linux]
     - xorg-libx11  # [linux]
 
-{% set grep = "grep" %}    # [unix]
+{% set grep = "grep" %}  # [unix]
 {% set grep = "findstr" %}  # [win]
 
 test: