[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: ffmpeg: update to the latest 4.4 version

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
7a6c7491 by Steve Lhomme at 2022-09-09T09:20:36+02:00
contrib: ffmpeg: update to the latest 4.4 version

Includes some fixes backported to 4.4.

(cherry picked from commit af785abd295bc9446eceaf127ccfc9d1759b64e9) (edited)
edited:
- 3.0 also supports libav

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
7c166c14 by Steve Lhomme at 2022-09-09T09:24:03+02:00
Revert "contrib: ffmpeg: fix a rare crash on some odd files with DVXA"

This reverts commit ad8bbb0d4ba523b405d8134caf357ae78009b94a.

- - - - -


2 changed files:

- − contrib/src/ffmpeg/0001-avcodec-pthread_frame-do-not-give-the-hardware-conte.patch
- contrib/src/ffmpeg/rules.mak


Changes:

=====================================
contrib/src/ffmpeg/0001-avcodec-pthread_frame-do-not-give-the-hardware-conte.patch deleted
=====================================
@@ -1,43 +0,0 @@
-From 2a2937b72e2ef17170a7cd617be3cfa578115b7a Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Tue, 17 Dec 2019 11:21:17 +0100
-Subject: [PATCH] avcodec/pthread_frame: do not give the hardware context
- internals to the user
-
-The internal data should not leak to the user. It can potentially be destroyed
-twice since the hwaccel uninit was also copied back to the user.
-
-This behaviour may only be found in VLC which uses frame threading with hardware
-decoding.
----
- libavcodec/pthread_frame.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
-index 9176027f15..26439c1058 100644
---- a/libavcodec/pthread_frame.c
-+++ b/libavcodec/pthread_frame.c
-@@ -293,14 +293,17 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src,
-         dst->color_range = src->color_range;
-         dst->chroma_sample_location = src->chroma_sample_location;
- 
--        dst->hwaccel = src->hwaccel;
--        dst->hwaccel_context = src->hwaccel_context;
-+        if (!for_user) {
-+            dst->hwaccel = src->hwaccel;
-+            dst->hwaccel_context = src->hwaccel_context;
-+        }
- 
-         dst->channels       = src->channels;
-         dst->sample_rate    = src->sample_rate;
-         dst->sample_fmt     = src->sample_fmt;
-         dst->channel_layout = src->channel_layout;
--        dst->internal->hwaccel_priv_data = src->internal->hwaccel_priv_data;
-+        if (!for_user)
-+            dst->internal->hwaccel_priv_data = src->internal->hwaccel_priv_data;
- 
-         if (!!dst->hw_frames_ctx != !!src->hw_frames_ctx ||
-             (dst->hw_frames_ctx && dst->hw_frames_ctx->data != src->hw_frames_ctx->data)) {
--- 
-2.27.0.windows.1
-


=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -5,7 +5,7 @@
 #USE_FFMPEG ?= 1
 
 ifndef USE_LIBAV
-FFMPEG_HASH=dc91b913b6260e85e1304c74ff7bb3c22a8c9fb1
+FFMPEG_HASH=d4b7b3c03ee2baf0166ce49dff17ec9beff684db
 FFMPEG_BRANCH=release/4.4
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
@@ -246,9 +246,6 @@ ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/0001-bring-back-XP-support.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-avcodec-vp9-Do-not-destroy-uninitialized-mutexes-con.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-dxva2_hevc-don-t-use-frames-as-reference-if-they-are.patch
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/ffmpeg/0001-avcodec-pthread_frame-do-not-give-the-hardware-conte.patch
-endif
 endif
 ifdef USE_LIBAV
 	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4bb5e44373917ea06f0e94c75ca763200cce2d64...7c166c1451b50720ac5d2050c0f844034005ba35

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4bb5e44373917ea06f0e94c75ca763200cce2d64...7c166c1451b50720ac5d2050c0f844034005ba35
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance