gnu: ffmpeg: Update to 8.0.

* gnu/packages/video.scm (ffmpeg-7): Replace with...
(ffmpeg): ... this updated version.
(ffmpeg): Adjust to use ffmpeg.
(ffmpeg-jami): Stay on ffmpeg-6.
* gnu/packages/tor-browsers.scm (make-torbrowser): Likewise.
* gnu/packages/python-xyz.scm (python-av): Likewise.
* gnu/packages/qt.scm (qtmultimedia): Likewise.

Change-Id: I2d7b1861a647f583da93fe230fd0734742671d4d

gnu/packages/python-xyz.scm

@@ -13102,8 +13102,7 @@ experimental data and metadata at the Laboratory for Fluorescence Dynamics.")
            python-pytest
            python-setuptools
            python-wheel))
-    (inputs
+    (inputs (list ffmpeg))
-     (list ffmpeg-7))
     (home-page "https://github.com/PyAV-Org/PyAV")
     (synopsis "Pythonic bindings for FFmpeg's libraries")
     (description

gnu/packages/qt.scm

@@ -2117,7 +2117,7 @@ Vulkan, OpenGL and other main graphic APIs.")
            vulkan-headers))
     (inputs
      (list alsa-lib
-           ffmpeg
+           ffmpeg-6
            glib
            libxkbcommon
            libxrandr

gnu/packages/tor-browsers.scm

@@ -240,7 +240,7 @@ Browser.")
            libxcomposite
            libxt
            libffi
-           ffmpeg-7
+           ffmpeg
            libvpx
            icu4c
            pixman

gnu/packages/video.scm

@@ -1645,17 +1645,17 @@ These tools require a supported graphics chip, driver, and VA-API back end to
 operate properly.")
     (license license:expat)))
 
-(define-public ffmpeg-7
+(define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "7.1.1")
+    (version "8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1c837agaw8ljhjx6ndp2w7hffi2mkb22vnmb8v0fbfqdbqwq8fbk"))))
+                "13kvs9rh5mp21gx64hdj0jlnz6q5c6spik8kh5q7fk6cnv61yxdj"))))
     (outputs '("out" "debug"))
     (build-system gnu-build-system)
     (inputs
@@ -1871,9 +1871,9 @@ convert and stream audio and video.  It includes the libavcodec
 audio/video codec library.")
     (license license:gpl2+)))
 
-(define-public ffmpeg
+(define-public ffmpeg-6
   (package
-    (inherit ffmpeg-7)
+    (inherit ffmpeg)
     (version "6.1.2")
     (source (origin
               (method url-fetch)
@@ -1887,7 +1887,7 @@ audio/video codec library.")
                 "ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"))))
     (arguments
      (if (target-x86-32?)
-         (substitute-keyword-arguments (package-arguments ffmpeg-7)
+         (substitute-keyword-arguments (package-arguments ffmpeg)
            ((#:phases phases)
             #~(modify-phases #$phases
                 (add-before 'configure 'relax-gcc-14-strictness
@@ -1897,7 +1897,7 @@ audio/video codec library.")
                      (string-append "-g -O2"
                                     " -Wno-error=incompatible-pointer-types"
                                     " -Wno-error=int-conversion")))))))
-         (package-arguments ffmpeg-7)))))
+         (package-arguments ffmpeg)))))
 
 (define-public ffmpeg-5
   (package
@@ -1984,6 +1984,7 @@ audio/video codec library.")
 
 ;;; Custom ffmpeg package used by Jami, which incorporates custom patches.
 (define-public ffmpeg-jami
+  (let ((ffmpeg ffmpeg-6))
     (package
       (inherit ffmpeg)
       (name "ffmpeg-jami")
@@ -2247,7 +2248,7 @@ audio/video codec library.")
                            "--enable-encoder=hevc_vaapi")
                          '())))))
       (inputs (modify-inputs (package-inputs ffmpeg)
-              (append pipewire)))))
+                (append pipewire))))))
 
 (define-public ffmpegthumbnailer
   (package