LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File ffmpeg-new-coder-errors.diff of Package ffmpeg (Project home:smarty12:kodi:next)

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).

---
 ffmpeg.c        |    4 ++--
 ffmpeg_filter.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: ffmpeg-3.0.1/ffmpeg.c
===================================================================
--- ffmpeg-3.0.1.orig/ffmpeg.c
+++ ffmpeg-3.0.1/ffmpeg.c
@@ -2525,7 +2525,7 @@ static int init_input_stream(int ist_ind
     if (ist->decoding_needed) {
         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);
         }
@@ -3021,7 +3021,7 @@ static int transcode_init(void)
                 ost->enc = avcodec_find_encoder(enc_ctx->codec_id);
             if (!ost->enc) {
                 /* should only happen when a default codec is not present. */
-                snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
+                snprintf(error, sizeof(error), "This build of ffmpeg does not include a \"%s\" encoder needed for output stream #%d:%d.",
                          avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
                 ret = AVERROR(EINVAL);
                 goto dump_format;
Index: ffmpeg-3.0.1/ffmpeg_filter.c
===================================================================
--- ffmpeg-3.0.1.orig/ffmpeg_filter.c
+++ ffmpeg-3.0.1/ffmpeg_filter.c
@@ -948,7 +948,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;
     }
@@ -1057,7 +1057,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_filter does not include a \"%s\" encoder needed for output stream #%d:%d.\n",
                      avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
             return AVERROR(EINVAL);
         }