forked from jengelh/ffmpeg-7
Compare commits
16 Commits
Author | SHA256 | Date | |
---|---|---|---|
32cbe46280 | |||
d30cb95aec | |||
|
e2cfa392ea | ||
|
47633c77ba | ||
baf5b4d954 | |||
f803df26e3 | |||
62e69514f7 | |||
c18297e308 | |||
ab72df490f | |||
c33511409d | |||
8c17f41823 | |||
c11c165366 | |||
d213111022 | |||
99ea9689b9 | |||
cfe0711bad | |||
5866842008 |
@ -0,0 +1,27 @@
|
||||
From: François Cartegnie <fcvlcdev@free.fr>
|
||||
Date: Mon, 13 May 2024 11:37:27 +0000
|
||||
Subject: avcodec/decode: clean-up if get_hw_frames_parameters fails
|
||||
|
||||
https://trac.ffmpeg.org/ticket/11013
|
||||
https://code.videolan.org/videolan/vlc/-/issues/28811
|
||||
|
||||
Fixes the following assert:
|
||||
|
||||
[00007f1df83d17e0] vaapi generic error: avcodec_get_hw_frames_parameters failed: -22
|
||||
Assertion p_dst->hwaccel_threadsafe || (!dst->hwaccel && !dst->internal->hwaccel_priv_data) failed at libavcodec/pthread_frame.c:349
|
||||
|
||||
Reproduced from VLC with VAAPI, when fallbacking from hw to sw.
|
||||
|
||||
--- a/libavcodec/pthread_frame.c
|
||||
+++ b/libavcodec/pthread_frame.c
|
||||
@@ -344,6 +344,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
return err;
|
||||
}
|
||||
|
||||
+ // hwaccel could have failed init due to some params
|
||||
+ if(!dst->hwaccel && dst->internal->hwaccel_priv_data)
|
||||
+ ff_hwaccel_uninit(dst);
|
||||
+
|
||||
// reset dst hwaccel state if needed
|
||||
av_assert0(p_dst->hwaccel_threadsafe ||
|
||||
(!dst->hwaccel && !dst->internal->hwaccel_priv_data));
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b
|
||||
size 10791240
|
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmYPNtMYHGZmbXBlZy1k
|
||||
ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYFdUIAIOFgLplbe7CHY0G3bQuCK8N
|
||||
Q+js2eLPxKNbeBhshcHDyNResAT+uHE7fQYRFUcETf5qqoPHyDptbG/o+onlGW8M
|
||||
vNwu6wTC3XiFjKjJKBRwyXYS31J+R/re2w+LiEI+OnekRhaQ/vbj1bbjREEQLtOv
|
||||
7086Oc6ZzMAsxjc6wGde4eJkhTQT8HYF6lU0Bsm4yeqCAcppfGv6OwZn8fyQ/L9i
|
||||
PaqFJFzs4C8PdRRdSQ7VifAcAAmyHNoRY611ZCbnJvoc7oEU44SVIKsryqRBunoX
|
||||
aAZ1eNwoI/Oz/uC/yK+S3oaAauZuUZFxgc0hqCxYLZF5TeRvF4Y8cPTTymTuVDM=
|
||||
=Hz9R
|
||||
-----END PGP SIGNATURE-----
|
BIN
ffmpeg-7.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
ffmpeg-7.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
11
ffmpeg-7.1.tar.xz.asc
Normal file
11
ffmpeg-7.1.tar.xz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmb549IYHGZmbXBlZy1k
|
||||
ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYilgH/2sKAFBy8ojPrYxVy7i+O3WO
|
||||
bE5lu2yhE6gHkHnxZga5k1uuhkRhapgTiUs9foG0zmL6Qfsg7lJ2EjrieD+hSWsw
|
||||
ApqHVW5SUUSrtY0kO9Z/2jQIRBH5JaMPSar6YNPTdXuSUcun784gPgwIGYwzAM/S
|
||||
14tkOZpq+X4nSJ4JezJDWeIsdz8zK4gIOuo0eCPbUgZ/A7wUMdypGZ9LOqk/mCc8
|
||||
RnErz36HlZzUnGrL73gxsGCQ2PXL+1oMHnt0antF90T4YNusOX9FprclH/jb+RLl
|
||||
jTb8RVb/4xJKV96ScMiwy2GaozzXFjzY1X7Gq8WN5NGRlbso6WQpqt8yunD7ib4=
|
||||
=A/aU
|
||||
-----END PGP SIGNATURE-----
|
109
ffmpeg-7.changes
109
ffmpeg-7.changes
@ -1,3 +1,112 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 15 08:18:54 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
|
||||
|
||||
- Adjust bconds to build the package in SLFO without xvidcore.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 2 08:20:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 7.1
|
||||
* ffmpeg CLI filtergraph chaining
|
||||
* pad_vaapi, drawbox_vaapi filters
|
||||
* vf_scale supports secondary ref input and framesync options
|
||||
* vf_scale2ref deprecated
|
||||
* removed DEC Alpha DSP and support code
|
||||
* perlin video source
|
||||
* Cropping metadata parsing and writing in Matroska and MP4/MOV
|
||||
de/muxers
|
||||
* YUV colorspace negotiation for codecs and filters, obsoleting
|
||||
the YUVJ pixel format
|
||||
* Vulkan H.264 and H.265 encoders
|
||||
* stream specifiers in fftools can now match by stream
|
||||
disposition
|
||||
* LCEVC enhancement data exporting in H.26x and MP4/ISOBMFF
|
||||
* LCEVC filter
|
||||
- Delete patches/ffmpeg-7-fix-crashes.patch,
|
||||
0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch (merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 30 12:34:56 UTC 2024 - olaf@aepfle.de
|
||||
|
||||
- Fix assertion due to missing priv_data cleanup on failed VAAPI
|
||||
acceleration with 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
|
||||
(ffmpeg#11013, vlc#28811)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 26 10:02:20 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- no longer build against libmfx; build also 15.5 against libvpl
|
||||
(boo#1230983)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 09:58:42 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
|
||||
to resolve build failure on armv7 [boo#1229338]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 7 07:37:24 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- Update to version 7.0.2:
|
||||
* avcodec/snow: Fix off by 1 error in run_buffer
|
||||
* avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 for snow
|
||||
* avformat/iamf_parse: Check for 0 samples
|
||||
* swscale: [loongarch] Fix checkasm-sw_yuv2rgb failure.
|
||||
* avcodec/aacps_tablegen_template: don't redefine CONFIG_HARDCODED_TABLES
|
||||
* avutil/hwcontext_vaapi: use the correct type for VASurfaceAttribExternalBuffers.buffers
|
||||
* avcodec/pcm-bluray/dvd: Use correct pointer types on BE
|
||||
* avcodec/pngenc: fix sBIT writing for indexed-color PNGs
|
||||
* avcodec/pngdec: use 8-bit sBIT cap for indexed PNGs per spec
|
||||
* avformat/mov: check that child boxes of trak are only present inside it
|
||||
* avformat/mov: check that sample and chunk count is 1 for HEIF
|
||||
* avcodec/videotoolboxenc: Fix bitrate doesn't work as expected
|
||||
* avdevice/dshow: Don't skip audio devices if no video device is present
|
||||
* avcodec/hdrenc: Allocate more space
|
||||
* avcodec/cfhdenc: Height of 16 is not supported
|
||||
* avcodec/cfhdenc: Allocate more space
|
||||
* avcodec/osq: fix integer overflow when applying factor
|
||||
* avcodec/osq: avoid using too large numbers for shifts and integers in update_residue_parameter()
|
||||
* avcodec/hevcdec: fix segfault on invalid film grain metadata (CVE-2024-32228, bsc#1227277)
|
||||
* avfilter/vf_tiltandshift: fix buffer offset for yuv422p input (CVE-2024-32229, bsc#1227295)
|
||||
* avcodec/mpegvideo_enc: Fix 1 line and one column images (CVE-2024-32230, bsc#1227296)
|
||||
* avcodec/pnmdec: Use 64bit for input size check (CVE-2024-7055, bsc#1229026)
|
||||
- Drop ffmpeg-7-CVE-2024-32228.patch:
|
||||
The fix has been merged.
|
||||
- Drop ffmpeg-7-CVE-2024-32229.patch:
|
||||
The fix has been merged.
|
||||
- Drop ffmpeg-7-CVE-2024-32230.patch:
|
||||
The fix has been merged.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 3 08:52:26 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- Add ffmpeg-7-fix-crashes.patch:
|
||||
Backporting 5b87869c from upstream, fix track handling when mixing
|
||||
IAMF and video tracks, Fixes crashes when muxing the two together.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 5 14:18:52 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- Add ffmpeg-7-CVE-2024-32229.patch:
|
||||
Backporting a528a54e from upstream, Fix buffer offset for yuv422p
|
||||
input.
|
||||
(CVE-2024-32229, bsc#1227295)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 2 12:26:28 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- Add ffmpeg-7-CVE-2024-32230.patch:
|
||||
Backporting 96449cfe from upstream, Fix 1 line and one column images.
|
||||
(CVE-2024-32230, bsc#1227296)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 2 11:57:01 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- Add ffmpeg-7-CVE-2024-32228.patch:
|
||||
Backporting 45964876 from upstream, Fix segfault on invalid film
|
||||
grain metadata.
|
||||
(CVE-2024-32228, bsc#1227277)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 7 11:39:41 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
@ -64,7 +64,7 @@
|
||||
%bcond_with x265
|
||||
%bcond_with xvid
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%if 0%{?suse_version} > 1600
|
||||
%bcond_without mysofa
|
||||
%bcond_without vidstab
|
||||
%bcond_without codec2
|
||||
@ -74,27 +74,35 @@
|
||||
%bcond_without opencore
|
||||
%bcond_without xvid
|
||||
%else
|
||||
%if 0%{?suse_version} > 1500
|
||||
%bcond_without mysofa
|
||||
%bcond_without vidstab
|
||||
%bcond_without codec2
|
||||
%bcond_without rubberband
|
||||
%bcond_without vulkan
|
||||
%bcond_without amrwb
|
||||
%bcond_without opencore
|
||||
%else
|
||||
%bcond_with mysofa
|
||||
%bcond_with vidstab
|
||||
%bcond_with codec2
|
||||
%bcond_with rubberband
|
||||
%bcond_with vulkan
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%define _name ffmpeg
|
||||
%define _major_version 7
|
||||
%define _major_expected 8
|
||||
|
||||
Name: ffmpeg-7
|
||||
Version: 7.0
|
||||
Version: 7.1
|
||||
Release: 0
|
||||
Summary: Set of libraries for working with various multimedia formats
|
||||
License: GPL-3.0-or-later
|
||||
Group: Productivity/Multimedia/Video/Editors and Convertors
|
||||
URL: https://ffmpeg.org/
|
||||
|
||||
#Freshcode-URL: http://freshcode.club/projects/ffmpeg
|
||||
#Git-Clone: git://source.ffmpeg.org/ffmpeg
|
||||
URL: https://ffmpeg.org/
|
||||
Source: https://www.ffmpeg.org/releases/%_name-%version.tar.xz
|
||||
Source2: https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc
|
||||
Source3: ffmpeg-7-rpmlintrc
|
||||
@ -104,7 +112,6 @@ Source6: ffmpeg-dlopen-headers.tar.xz
|
||||
Source92: ffmpeg_get_dlopen_headers.sh
|
||||
Source98: http://ffmpeg.org/ffmpeg-devel.asc#/ffmpeg-7.keyring
|
||||
Source99: baselibs.conf
|
||||
|
||||
Patch1: ffmpeg-arm6l.diff
|
||||
Patch2: ffmpeg-new-coder-errors.diff
|
||||
Patch3: ffmpeg-codec-choice.diff
|
||||
@ -112,7 +119,7 @@ Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
|
||||
Patch5: work-around-abi-break.patch
|
||||
Patch10: ffmpeg-chromium.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
|
||||
Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
|
||||
BuildRequires: ladspa-devel
|
||||
BuildRequires: libgsm-devel
|
||||
BuildRequires: libmp3lame-devel >= 3.98.3
|
||||
@ -232,11 +239,7 @@ BuildRequires: pkgconfig(shaderc) >= 2019.1
|
||||
BuildRequires: pkgconfig(vulkan) >= 1.3.255
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150600
|
||||
%ifarch x86_64 %x86_64
|
||||
BuildRequires: pkgconfig(libmfx)
|
||||
%endif
|
||||
%else
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
|
||||
%ifarch x86_64 %x86_64
|
||||
BuildRequires: pkgconfig(vpl) >= 2.6
|
||||
%endif
|
||||
@ -633,11 +636,7 @@ LDFLAGS="%_lto_cflags" \
|
||||
%endif
|
||||
%endif
|
||||
--enable-lv2 \
|
||||
%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150600
|
||||
%ifarch x86_64 %x86_64
|
||||
--enable-libmfx \
|
||||
%endif
|
||||
%else
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
|
||||
%ifarch x86_64 %x86_64
|
||||
--enable-libvpl \
|
||||
%endif
|
||||
@ -809,7 +808,7 @@ done
|
||||
%else
|
||||
%define _name ffmpeg
|
||||
Name: ffmpeg-7-mini
|
||||
Version: 7.0
|
||||
Version: 7.1
|
||||
Release: 0
|
||||
Summary: Set of libraries for working with various multimedia formats
|
||||
License: GPL-3.0-or-later
|
||||
@ -825,6 +824,7 @@ Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
|
||||
Patch5: work-around-abi-break.patch
|
||||
Patch10: ffmpeg-chromium.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
|
||||
BuildRequires: c_compiler
|
||||
Requires: this-is-only-for-build-envs
|
||||
|
||||
|
@ -11,11 +11,11 @@ Add av_stream_get_first_dts for Chromium
|
||||
libavformat/utils.c | 7 +++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
Index: ffmpeg-7.0/libavformat/avformat.h
|
||||
Index: ffmpeg-7.1/libavformat/avformat.h
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/libavformat/avformat.h
|
||||
+++ ffmpeg-7.0/libavformat/avformat.h
|
||||
@@ -1170,6 +1170,10 @@ typedef struct AVStreamGroup {
|
||||
--- ffmpeg-7.1.orig/libavformat/avformat.h
|
||||
+++ ffmpeg-7.1/libavformat/avformat.h
|
||||
@@ -1202,6 +1202,10 @@ typedef struct AVStreamGroup {
|
||||
|
||||
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
||||
|
||||
@ -26,13 +26,13 @@ Index: ffmpeg-7.0/libavformat/avformat.h
|
||||
#define AV_PROGRAM_RUNNING 1
|
||||
|
||||
/**
|
||||
Index: ffmpeg-7.0/libavformat/utils.c
|
||||
Index: ffmpeg-7.1/libavformat/utils.c
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/libavformat/utils.c
|
||||
+++ ffmpeg-7.0/libavformat/utils.c
|
||||
@@ -56,6 +56,13 @@ int ff_unlock_avformat(void)
|
||||
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
|
||||
}
|
||||
--- ffmpeg-7.1.orig/libavformat/utils.c
|
||||
+++ ffmpeg-7.1/libavformat/utils.c
|
||||
@@ -44,6 +44,13 @@
|
||||
* various utility functions for use within FFmpeg
|
||||
*/
|
||||
|
||||
+// Chromium: We use the internal field first_dts vvv
|
||||
+int64_t av_stream_get_first_dts(const AVStream *st)
|
||||
|
@ -23,19 +23,19 @@ Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
|
||||
create mode 100644 libavcodec/libopenh264_dlopen.c
|
||||
create mode 100644 libavcodec/libopenh264_dlopen.h
|
||||
|
||||
Index: ffmpeg-7.0/configure
|
||||
Index: ffmpeg-7.1/configure
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/configure
|
||||
+++ ffmpeg-7.0/configure
|
||||
@@ -252,6 +252,7 @@ External library support:
|
||||
--- ffmpeg-7.1.orig/configure
|
||||
+++ ffmpeg-7.1/configure
|
||||
@@ -255,6 +255,7 @@ External library support:
|
||||
--enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
|
||||
--enable-libopencv enable video filtering via libopencv [no]
|
||||
--enable-libopenh264 enable H.264 encoding via OpenH264 [no]
|
||||
+ --enable-libopenh264-dlopen enable H.264 encoding via dlopen()'ed OpenH264 [no]
|
||||
--enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no]
|
||||
--enable-libopenjpeg enable JPEG 2000 encoding via OpenJPEG [no]
|
||||
--enable-libopenmpt enable decoding tracked files via libopenmpt [no]
|
||||
--enable-libopenvino enable OpenVINO as a DNN module backend
|
||||
@@ -1933,6 +1934,7 @@ EXTERNAL_LIBRARY_LIST="
|
||||
@@ -1939,6 +1940,7 @@ EXTERNAL_LIBRARY_LIST="
|
||||
libmysofa
|
||||
libopencv
|
||||
libopenh264
|
||||
@ -43,7 +43,7 @@ Index: ffmpeg-7.0/configure
|
||||
libopenjpeg
|
||||
libopenmpt
|
||||
libopenvino
|
||||
@@ -6921,6 +6923,7 @@ enabled libopencv && { check_hea
|
||||
@@ -6966,6 +6968,7 @@ enabled libopencv && { check_hea
|
||||
require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
|
||||
require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
|
||||
enabled libopenh264 && require_pkg_config libopenh264 "openh264 >= 1.3.0" wels/codec_api.h WelsGetCodecVersion
|
||||
@ -51,11 +51,11 @@ Index: ffmpeg-7.0/configure
|
||||
enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
|
||||
{ require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
|
||||
enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
|
||||
Index: ffmpeg-7.0/libavcodec/Makefile
|
||||
Index: ffmpeg-7.1/libavcodec/Makefile
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/libavcodec/Makefile
|
||||
+++ ffmpeg-7.0/libavcodec/Makefile
|
||||
@@ -1128,6 +1128,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
|
||||
--- ffmpeg-7.1.orig/libavcodec/Makefile
|
||||
+++ ffmpeg-7.1/libavcodec/Makefile
|
||||
@@ -1138,6 +1138,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
|
||||
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o
|
||||
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
|
||||
OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o
|
||||
@ -63,10 +63,10 @@ Index: ffmpeg-7.0/libavcodec/Makefile
|
||||
OBJS-$(CONFIG_LIBOPENH264_DECODER) += libopenh264dec.o libopenh264.o
|
||||
OBJS-$(CONFIG_LIBOPENH264_ENCODER) += libopenh264enc.o libopenh264.o
|
||||
OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o
|
||||
Index: ffmpeg-7.0/libavcodec/libopenh264.c
|
||||
Index: ffmpeg-7.1/libavcodec/libopenh264.c
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/libavcodec/libopenh264.c
|
||||
+++ ffmpeg-7.0/libavcodec/libopenh264.c
|
||||
--- ffmpeg-7.1.orig/libavcodec/libopenh264.c
|
||||
+++ ffmpeg-7.1/libavcodec/libopenh264.c
|
||||
@@ -20,8 +20,13 @@
|
||||
*/
|
||||
|
||||
@ -81,10 +81,10 @@ Index: ffmpeg-7.0/libavcodec/libopenh264.c
|
||||
|
||||
#include "libavutil/error.h"
|
||||
#include "libavutil/log.h"
|
||||
Index: ffmpeg-7.0/libavcodec/libopenh264_dlopen.c
|
||||
Index: ffmpeg-7.1/libavcodec/libopenh264_dlopen.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ ffmpeg-7.0/libavcodec/libopenh264_dlopen.c
|
||||
+++ ffmpeg-7.1/libavcodec/libopenh264_dlopen.c
|
||||
@@ -0,0 +1,147 @@
|
||||
+/*
|
||||
+ * OpenH264 dlopen code
|
||||
@ -233,10 +233,10 @@ Index: ffmpeg-7.0/libavcodec/libopenh264_dlopen.c
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
Index: ffmpeg-7.0/libavcodec/libopenh264_dlopen.h
|
||||
Index: ffmpeg-7.1/libavcodec/libopenh264_dlopen.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ ffmpeg-7.0/libavcodec/libopenh264_dlopen.h
|
||||
+++ ffmpeg-7.1/libavcodec/libopenh264_dlopen.h
|
||||
@@ -0,0 +1,58 @@
|
||||
+/*
|
||||
+ * OpenH264 dlopen code
|
||||
@ -296,10 +296,10 @@ Index: ffmpeg-7.0/libavcodec/libopenh264_dlopen.h
|
||||
+#endif /* CONFIG_LIBOPENH264_DLOPEN */
|
||||
+
|
||||
+#endif /* HAVE_LIBOPENH264_DLOPEN_H */
|
||||
Index: ffmpeg-7.0/libavcodec/libopenh264dec.c
|
||||
Index: ffmpeg-7.1/libavcodec/libopenh264dec.c
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/libavcodec/libopenh264dec.c
|
||||
+++ ffmpeg-7.0/libavcodec/libopenh264dec.c
|
||||
--- ffmpeg-7.1.orig/libavcodec/libopenh264dec.c
|
||||
+++ ffmpeg-7.1/libavcodec/libopenh264dec.c
|
||||
@@ -19,8 +19,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
@ -324,10 +324,10 @@ Index: ffmpeg-7.0/libavcodec/libopenh264dec.c
|
||||
if (WelsCreateDecoder(&s->decoder)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
|
||||
return AVERROR_UNKNOWN;
|
||||
Index: ffmpeg-7.0/libavcodec/libopenh264enc.c
|
||||
Index: ffmpeg-7.1/libavcodec/libopenh264enc.c
|
||||
===================================================================
|
||||
--- ffmpeg-7.0.orig/libavcodec/libopenh264enc.c
|
||||
+++ ffmpeg-7.0/libavcodec/libopenh264enc.c
|
||||
--- ffmpeg-7.1.orig/libavcodec/libopenh264enc.c
|
||||
+++ ffmpeg-7.1/libavcodec/libopenh264enc.c
|
||||
@@ -19,8 +19,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
@ -37,10 +37,10 @@ releases.
|
||||
ffbuild/library.mak | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: ffmpeg-5.1/ffbuild/library.mak
|
||||
Index: ffmpeg-7.1/ffbuild/library.mak
|
||||
===================================================================
|
||||
--- ffmpeg-5.1.orig/ffbuild/library.mak
|
||||
+++ ffmpeg-5.1/ffbuild/library.mak
|
||||
--- ffmpeg-7.1.orig/ffbuild/library.mak
|
||||
+++ ffmpeg-7.1/ffbuild/library.mak
|
||||
@@ -59,7 +59,7 @@ $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)ver
|
||||
$$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user