ffmpeg-4/ffmpeg-new-coder-errors.diff
Jan Engelhardt ed05bfc5e6 Accepting request 928002 from home:iznogood:branches:multimedia:libs
- Update to version 4.4.1:
  * Stable bug fix release, mainly codecs and format fixes.
- Refresh patches with quilt.
- Drop patches fixed upstream:
  * ffmpeg-CVE-2021-33815.patch
  * ffmpeg-CVE-2021-38114.patch
  * ffmpeg-CVE-2021-38171.patch
  * ffmpeg-CVE-2020-22037.patch

OBS-URL: https://build.opensuse.org/request/show/928002
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=171
2021-10-28 18:25:04 +00:00

61 lines
3.1 KiB
Diff

From: Jan Engelhardt <jengelh@inai.de>
Date: 2016-04-10 23:23:53.138440254 +0200
Improve the error messages a bit to say what's really going on
(in light of openSUSE's reduced build).
---
fftools/ffmpeg.c | 2 +-
fftools/ffmpeg_filter.c | 4 ++--
fftools/ffmpeg_opt.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Index: ffmpeg-4.4.1/fftools/ffmpeg.c
===================================================================
--- ffmpeg-4.4.1.orig/fftools/ffmpeg.c
+++ ffmpeg-4.4.1/fftools/ffmpeg.c
@@ -2954,7 +2954,7 @@ static int init_input_stream(int ist_ind
if (ist->decoding_needed) {
const AVCodec *codec = ist->dec;
if (!codec) {
- snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
+ snprintf(error, error_len, "This build of ffmpeg does not include a \"%s\" decoder needed for input stream #%d:%d.",
avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index);
return AVERROR(EINVAL);
}
Index: ffmpeg-4.4.1/fftools/ffmpeg_filter.c
===================================================================
--- ffmpeg-4.4.1.orig/fftools/ffmpeg_filter.c
+++ ffmpeg-4.4.1/fftools/ffmpeg_filter.c
@@ -959,7 +959,7 @@ static int configure_input_filter(Filter
{
if (!ifilter->ist->dec) {
av_log(NULL, AV_LOG_ERROR,
- "No decoder for stream #%d:%d, filtering impossible\n",
+ "This build of ffmpeg does not have a suitable decoder for stream #%d:%d enabled, filtering impossible\n",
ifilter->ist->file_index, ifilter->ist->st->index);
return AVERROR_DECODER_NOT_FOUND;
}
@@ -1103,7 +1103,7 @@ int configure_filtergraph(FilterGraph *f
if (!ost->enc) {
/* identical to the same check in ffmpeg.c, needed because
complex filter graphs are initialized earlier */
- av_log(NULL, AV_LOG_ERROR, "Encoder (codec %s) not found for output stream #%d:%d\n",
+ av_log(NULL, AV_LOG_ERROR, "This build of ffmpeg does not include a \"%s\" encoder needed for output stream #%d:%d.\n",
avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index);
ret = AVERROR(EINVAL);
goto fail;
Index: ffmpeg-4.4.1/fftools/ffmpeg_opt.c
===================================================================
--- ffmpeg-4.4.1.orig/fftools/ffmpeg_opt.c
+++ ffmpeg-4.4.1/fftools/ffmpeg_opt.c
@@ -1400,7 +1400,7 @@ static int choose_encoder(OptionsContext
if (!ost->enc) {
av_log(NULL, AV_LOG_FATAL, "Automatic encoder selection failed for "
"output stream #%d:%d. Default encoder for format %s (codec %s) is "
- "probably disabled. Please choose an encoder manually.\n",
+ "probably disabled or this build of ffmpeg does not include that codec. Please choose an encoder manually.\n",
ost->file_index, ost->index, s->oformat->name,
avcodec_get_name(ost->st->codecpar->codec_id));
return AVERROR_ENCODER_NOT_FOUND;