In avcodec_open2(), apply consistent casing and avoid "or" conjunction at the beginning of a sentence, in the messages issued in case of experimental codec usage.
Unified · Split
| @@ -933,12 +933,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code · 932 unmodified lines | |||
| 933 | const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; | 933 | const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; |
| 934 | AVCodec *codec2; | 934 | AVCodec *codec2; |
| 935 | av_log(NULL, AV_LOG_ERROR, | 935 | av_log(NULL, AV_LOG_ERROR, |
| 936 | "%s '%s' is experimental but experimental codecs are not enabled, " | 936 | "The %s '%s' is experimental but experimental codecs are not enabled, " |
| 937 | "Add '-strict %d' if you want to use it.\n", | 937 | "add '-strict %d' if you want to use it.\n", |
| 938 | codec_string, codec->name, FF_COMPLIANCE_EXPERIMENTAL); | 938 | codec_string, codec->name, FF_COMPLIANCE_EXPERIMENTAL); |
| 939 | codec2 = av_codec_is_encoder(codec) ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id); | 939 | codec2 = av_codec_is_encoder(codec) ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id); |
| 940 | if (!(codec2->capabilities & CODEC_CAP_EXPERIMENTAL)) | 940 | if (!(codec2->capabilities & CODEC_CAP_EXPERIMENTAL)) |
| 941 | av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n", | 941 | av_log(NULL, AV_LOG_ERROR, "Alternatively use the non experimental %s '%s'.\n", |
| 942 | codec_string, codec2->name); | 942 | codec_string, codec2->name); |
| 943 | ret = AVERROR_EXPERIMENTAL; | 943 | ret = AVERROR_EXPERIMENTAL; |
| 944 | goto free_and_end; | 944 | goto free_and_end; |