apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-21 16:10:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg: return an error from assert_avoptions() instead of aborting

Browse Source 
Rename it to check_avoptions().
This commit is contained in:
Anton Khirnov
2023-07-14 18:18:57 +02:00
parent eda1fac27a
commit 2f155b18a1
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fftools/ffmpeg_enc.c
View File

@@ -407,7 +407,10 @@ int enc_open(OutputStream *ost, AVFrame *frame)
ost->sq_idx_encode, ost->enc_ctx->frame_size);
}
assert_avoptions(ost->encoder_opts);
ret = check_avoptions(ost->encoder_opts);
if (ret < 0)
return ret;
if (ost->enc_ctx->bit_rate && ost->enc_ctx->bit_rate < 1000 &&
ost->enc_ctx->codec_id != AV_CODEC_ID_CODEC2 /* don't complain about 700 bit/s modes */)
av_log(ost, AV_LOG_WARNING, "The bitrate parameter is set too low."