-
-
Notifications
You must be signed in to change notification settings - Fork 131
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add fixes for overlay qsv to allow different underlying devices
- Loading branch information
1 parent
210bbd8
commit b23f9c6
Showing
2 changed files
with
20 additions
and
0 deletions.
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
debian/patches/0029-add-fixes-for-overlay-qsv-to-allow-different-underlying-devices.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Index: jellyfin-ffmpeg/libavfilter/vf_overlay_qsv.c | ||
=================================================================== | ||
--- jellyfin-ffmpeg.orig/libavfilter/vf_overlay_qsv.c | ||
+++ jellyfin-ffmpeg/libavfilter/vf_overlay_qsv.c | ||
@@ -281,14 +281,6 @@ static int config_output(AVFilterLink *o | ||
(in0->format != AV_PIX_FMT_QSV && in1->format == AV_PIX_FMT_QSV)) { | ||
av_log(ctx, AV_LOG_ERROR, "Mixing hardware and software pixel formats is not supported.\n"); | ||
return AVERROR(EINVAL); | ||
- } else if (in0->format == AV_PIX_FMT_QSV) { | ||
- AVHWFramesContext *hw_frame0 = (AVHWFramesContext *)in0->hw_frames_ctx->data; | ||
- AVHWFramesContext *hw_frame1 = (AVHWFramesContext *)in1->hw_frames_ctx->data; | ||
- | ||
- if (hw_frame0->device_ctx != hw_frame1->device_ctx) { | ||
- av_log(ctx, AV_LOG_ERROR, "Inputs with different underlying QSV devices are forbidden.\n"); | ||
- return AVERROR(EINVAL); | ||
- } | ||
} | ||
|
||
outlink->w = vpp->var_values[VAR_MW]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters