ffmpeg6: update to 6.1.2.

This commit is contained in:
Andrew Benson 2024-08-04 19:28:53 -05:00
parent 51095113f6
commit 428b24c10d
3 changed files with 6 additions and 21 deletions

View File

@ -4,12 +4,12 @@ index d0339b2..c4b55cb 100644
+++ b/libavcodec/vaapi_av1.c
@@ -19,6 +19,7 @@
*/
#include "libavutil/frame.h"
+#include "libavutil/mem.h"
#include "libavutil/pixdesc.h"
#include "hwconfig.h"
#include "hwaccel_internal.h"
#include "vaapi_decode.h"
#include "internal.h"
@@ -43,6 +44,9 @@ typedef struct VAAPIAV1DecContext {
*/
VAAPIAV1FrameRef ref_tab[AV1_NUM_REF_FRAMES];

View File

@ -1,15 +0,0 @@
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index da700f25e9..b501964089 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -1076,6 +1076,9 @@ static int qsv_decode_frame(AVCodecContext *avctx, AVFrame *frame,
ret = qsv_process_data(avctx, &s->qsv, frame, got_frame, &s->buffer_pkt);
if (ret < 0){
+ if (ret == AVERROR(EAGAIN))
+ ret = 0;
+
/* Drop buffer_pkt when failed to decode the packet. Otherwise,
the decoder will keep decoding the failure packet. */
av_packet_unref(&s->buffer_pkt);

View File

@ -1,8 +1,8 @@
# Template file for 'ffmpeg6'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg6
version=6.0.1
revision=3
version=6.1.2
revision=1
hostmakedepends="pkg-config perl"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
checksum=9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623
checksum=3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38
build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl"
desc_option_sofa="Enable support for AES SOFA"