Skip to content

Commit

Permalink
add fixes for overlay qsv to allow different underlying devices
Browse files Browse the repository at this point in the history
  • Loading branch information
nyanmisaka committed Nov 13, 2021
1 parent 210bbd8 commit b23f9c6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
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];
1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
0026-add-fixes-for-armhf-build-with-gcc-11.patch
0027-add-fixes-to-improve-the-performance-of-vaapi-encode.patch
0028-add-fixes-for-alignment-issue-when-upload-to-qsv.patch
0029-add-fixes-for-overlay-qsv-to-allow-different-underlying-devices.patch

0 comments on commit b23f9c6

Please sign in to comment.