virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

configure: bump LCEVCdec minimum required version to 4.0.0

Browse Source 
The project introduced API breaking changes to some of their public functions,
and given the library is relatively new, just bump the minimum supported
version instead of adding ifdeffery to the source files.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-08-24 18:39:10 -03:00
parent 6c07a4f558
commit fa23202cc7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -7065,7 +7065,7 @@ enabled libklvanc && require libklvanc libklvanc/vanc.h klvanc_context_c
enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 2.0.0" kvazaar.h kvz_api_get enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 2.0.0" kvazaar.h kvz_api_get
enabled liblc3 && require_pkg_config liblc3 "lc3 >= 1.1.0" lc3.h lc3_hr_setup_encoder enabled liblc3 && require_pkg_config liblc3 "lc3 >= 1.1.0" lc3.h lc3_hr_setup_encoder
enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_db_create enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_db_create
enabled liblcevc_dec && require_pkg_config liblcevc_dec "lcevc_dec >= 2.0.0" "LCEVC/lcevc_dec.h" LCEVC_CreateDecoder enabled liblcevc_dec && require_pkg_config liblcevc_dec "lcevc_dec >= 4.0.0" "LCEVC/lcevc_dec.h" LCEVC_CreateDecoder
if enabled libmfx && enabled libvpl; then if enabled libmfx && enabled libvpl; then
die "ERROR: can not use libmfx and libvpl together" die "ERROR: can not use libmfx and libvpl together"

4
libavcodec/lcevcdec.c
View File

@@ -141,7 +141,7 @@ static int lcevc_send_frame(void *logctx, FFLCEVCFrame *frame_ctx, const AVFrame
if (!sd) if (!sd)
return 1; return 1;
res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, in->pts, 0, sd->data, sd->size); res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, in->pts, sd->data, sd->size);
if (res != LCEVC_Success) if (res != LCEVC_Success)
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
@@ -149,7 +149,7 @@ static int lcevc_send_frame(void *logctx, FFLCEVCFrame *frame_ctx, const AVFrame
if (ret < 0) if (ret < 0)
return ret; return ret;
res = LCEVC_SendDecoderBase(lcevc->decoder, in->pts, 0, picture, -1, NULL); res = LCEVC_SendDecoderBase(lcevc->decoder, in->pts, picture, -1, NULL);
if (res != LCEVC_Success) if (res != LCEVC_Success)
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;

4
libavfilter/vf_lcevc.c
View File

@@ -139,7 +139,7 @@ static int send_frame(AVFilterLink *inlink, AVFrame *in)
return ret; return ret;
if (sd) { if (sd) {
res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, in->pts, 0, sd->data, sd->size); res = LCEVC_SendDecoderEnhancementData(lcevc->decoder, in->pts, sd->data, sd->size);
if (res == LCEVC_Again) if (res == LCEVC_Again)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
else if (res != LCEVC_Success) { 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, in->pts, picture, -1, in);
if (res != LCEVC_Success) { if (res != LCEVC_Success) {
av_log(ctx, AV_LOG_ERROR, "LCEVC_SendDecoderBase failed\n"); av_log(ctx, AV_LOG_ERROR, "LCEVC_SendDecoderBase failed\n");
LCEVC_FreePicture(lcevc->decoder, picture); LCEVC_FreePicture(lcevc->decoder, picture);