Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
440
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
1e0b78a9
Commit
1e0b78a9
authored
2 years ago
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ffmpeg: fix DXVA2/D3D11 crash on bogus references
Fixes #26738
parent
e2f5fd4a
No related branches found
No related tags found
1 merge request
!1648
ffmpeg: fix DXVA2/D3D11 crash on bogus references
Pipeline
#204610
passed with stage
in 20 minutes and 8 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/ffmpeg/0001-dxva2_hevc-don-t-use-frames-as-reference-if-they-are.patch
+34
-0
34 additions, 0 deletions
...xva2_hevc-don-t-use-frames-as-reference-if-they-are.patch
contrib/src/ffmpeg/rules.mak
+1
-0
1 addition, 0 deletions
contrib/src/ffmpeg/rules.mak
with
35 additions
and
0 deletions
contrib/src/ffmpeg/0001-dxva2_hevc-don-t-use-frames-as-reference-if-they-are.patch
0 → 100644
+
34
−
0
View file @
1e0b78a9
From b2e89bd9c548d899ec2fecfc1aa550e9ddfe9777 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 23 Mar 2022 14:52:31 +0100
Subject: [PATCH] dxva2_hevc: don't use frames as reference if they are not
marked as such
Similar to how a frame is considered for referencing for the RefPicList array.
This will do the same for RefPicSetStCurrBefore, RefPicSetStCurrAfter and
RefPicSetLtCurr.
Fixes playback of http://www.gbbsoft.pl/!download/!/Film1.mp4
Ref. VLC issue https://code.videolan.org/videolan/vlc/-/issues/26738
Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
---
libavcodec/dxva2_hevc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
index 98b3e74bd7..28c0b26733 100644
--- a/libavcodec/dxva2_hevc.c
+++ b/libavcodec/dxva2_hevc.c
@@ -249,7 +249,7 @@
static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *
const HEVCFrame *frame = NULL; \
while (!frame && j < rpl->nb_refs) \
frame = rpl->ref[j++]; \
- if (frame) \
+ if (frame && frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF)) \
pp->ref_list[i] = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, frame->frame)); \
else \
pp->ref_list[i] = 0xff; \
--
2.27.0.windows.1
This diff is collapsed.
Click to expand it.
contrib/src/ffmpeg/rules.mak
+
1
−
0
View file @
1e0b78a9
...
...
@@ -220,6 +220,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
$(
APPLY
)
$(
SRC
)
/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch
$(
APPLY
)
$(
SRC
)
/ffmpeg/0001-avcodec-vp9-Do-not-destroy-uninitialized-mutexes-con.patch
$(
APPLY
)
$(
SRC
)
/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch
$(
APPLY
)
$(
SRC
)
/ffmpeg/0001-dxva2_hevc-don-t-use-frames-as-reference-if-they-are.patch
$(
MOVE
)
.ffmpeg
:
ffmpeg
...
...
This diff is collapsed.
Click to expand it.
Steve Lhomme
@robUx4
mentioned in merge request
!1673 (merged)
·
2 years ago
mentioned in merge request
!1673 (merged)
mentioned in merge request !1673
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment