Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg plugin: correct the version check for avcodec_get_supported_config

Browse Source 
It was added in ffmpeg 7.1 at avcodec API (61, 14) but we were checking for and
using it at API 61, which matched in ffmpeg 7.0 and failed to compile.

Fixes: 3e1a9ec3e704c98b19fd870728d0e3fe1b60126b
This commit is contained in:
Eli Schwartz 2025-02-04 23:15:06 -05:00
parent 3a7c2f4700
commit eccf33a2c2
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/utils/ffmpeg.c
View File

@ -240,7 +240,7 @@ open_output_file(Transcoder *t) {
av_channel_layout_default(&t->enc_ctx->ch_layout, t->dec_ctx->ch_layout.nb_channels); av_channel_layout_default(&t->enc_ctx->ch_layout, t->dec_ctx->ch_layout.nb_channels);
t->enc_ctx->sample_rate = t->dec_ctx->sample_rate; t->enc_ctx->sample_rate = t->dec_ctx->sample_rate;
int ret; int ret;
#if LIBAVCODEC_VERSION_MAJOR >= 61 #if LIBAVCODEC_VERSION_MAJOR >= 61 && LIBAVCODEC_VERSION_MINOR >= 14
const enum AVSampleFormat *sample_fmts = NULL; const enum AVSampleFormat *sample_fmts = NULL;
ret = avcodec_get_supported_config(t->dec_ctx, output_codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, (const void**)&sample_fmts, NULL); ret = avcodec_get_supported_config(t->dec_ctx, output_codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, (const void**)&sample_fmts, NULL);
t->enc_ctx->sample_fmt = (ret >= 0 && sample_fmts) ? sample_fmts[0] : t->dec_ctx->sample_fmt; t->enc_ctx->sample_fmt = (ret >= 0 && sample_fmts) ? sample_fmts[0] : t->dec_ctx->sample_fmt;