mirror of
https://github.com/terrapkg/packages.git
synced 2026-06-08 20:57:38 +00:00
fix(ffmpeg): Track LCEVCdec, update patches, drop libnpp for now (#5993)
* Rebase on F42 * Empty commit I hate GitHub Signed-off-by: Gilver <rockgrub@disroot.org> * This URL is unreachable with the source fetching cURL params currently * GCC14 real this time? Signed-off-by: Gilver <rockgrub@disroot.org> * Okay Signed-off-by: Gilver <rockgrub@disroot.org> * Gonna have to figure something else out Signed-off-by: Gilver <rockgrub@disroot.org> * Death * I guess maybe Signed-off-by: Gilver <rockgrub@disroot.org> * ? Signed-off-by: Gilver <rockgrub@disroot.org> * Try removing Wall again I guess Signed-off-by: Gilver <rockgrub@disroot.org> * Oops Signed-off-by: Gilver <rockgrub@disroot.org> * IDK * Update configure.patch Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * chore: Also track LCEVCdec * chore: Change some patches * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * Update ffmpeg.spec Signed-off-by: Gilver <rockgrub@disroot.org> * chore: Disable libnpp because it's just BROKEN Signed-off-by: Gilver <rockgrub@disroot.org> * chore(update.rhai): Comment out libnpp tracking for now Signed-off-by: Gilver <rockgrub@disroot.org> * chore: Delete ffmpeg-nvcc.patch Signed-off-by: Gilver <rockgrub@disroot.org> --------- Signed-off-by: Gilver <rockgrub@disroot.org> Co-authored-by: madomado <madonuko@outlook.com>
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
--- a/libavcodec/lcevcdec.c
|
||||
+++ b/libavcodec/lcevcdec.c
|
||||
@@ -139,7 +139,7 @@ static int lcevc_send_frame(void *logctx
|
||||
if (!sd)
|
||||
return 1;
|
||||
|
||||
- res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, in->pts, 0, sd->data, sd->size);
|
||||
+ res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, (uint64_t) in->pts, sd->data, sd->size);
|
||||
if (res != LCEVC_Success)
|
||||
return AVERROR_EXTERNAL;
|
||||
|
||||
@@ -147,7 +147,7 @@ static int lcevc_send_frame(void *logctx
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
- res = LCEVC_SendDecoderBase(lcevc->decoder, in->pts, 0, picture, -1, NULL);
|
||||
+ res = LCEVC_SendDecoderBase(lcevc->decoder, (uint64_t) in->pts, picture, -1, NULL);
|
||||
if (res != LCEVC_Success)
|
||||
return AVERROR_EXTERNAL;
|
||||
|
||||
--- a/libavfilter/vf_lcevc.c
|
||||
+++ b/libavfilter/vf_lcevc.c
|
||||
@@ -139,7 +139,7 @@ static int send_frame(AVFilterLink *inlink, AVFrame *in)
|
||||
return ret;
|
||||
|
||||
if (sd) {
|
||||
- res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, in->pts, 0, sd->data, sd->size);
|
||||
+ res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, (uint64_t) in->pts, sd->data, sd->size);
|
||||
if (res == LCEVC_Again)
|
||||
return AVERROR(EAGAIN);
|
||||
else if (res != LCEVC_Success) {
|
||||
@@ -148,7 +148,7 @@ static int send_frame(AVFilterLink *inlink, AVFrame *in)
|
||||
}
|
||||
}
|
||||
|
||||
- res = LCEVC_SendDecoderBase(lcevc->decoder, in->pts, 0, picture, -1, in);
|
||||
+ res = LCEVC_SendDecoderBase(lcevc->decoder, (uint64_t) in->pts, picture, -1, in);
|
||||
if (res != LCEVC_Success) {
|
||||
av_log(ctx, AV_LOG_ERROR, "LCEVC_SendDecoderBase failed\n");
|
||||
LCEVC_FreePicture(lcevc->decoder, picture);
|
||||
Reference in New Issue
Block a user