[SCM] libav/experimental: Change imprecise "Unknown codec" message to say "encoder" or "decoder" instead of "codec"

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4f48929248e2d5c47ea0313155368df6ec2e83fa
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Aug 19 11:12:47 2007 +0000

    Change imprecise "Unknown codec" message to say "encoder" or "decoder"
    instead of "codec"
    
    Originally committed as revision 10142 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 6c8751a..ddef667 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2499,6 +2499,7 @@ static void opt_input_ts_offset(const char *arg)
 
 static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
 {
+    char *codec_string = encoder ? "encoder" : "decoder";
     AVCodec *codec;
 
     if(!name)
@@ -2507,11 +2508,11 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
         avcodec_find_encoder_by_name(name) :
         avcodec_find_decoder_by_name(name);
     if(!codec) {
-        av_log(NULL, AV_LOG_ERROR, "Unknown codec '%s'\n", name);
+        av_log(NULL, AV_LOG_ERROR, "Unknown %s '%s'\n", codec_string, name);
         exit(1);
     }
     if(codec->type != type) {
-        av_log(NULL, AV_LOG_ERROR, "Invalid codec type '%s'\n", name);
+        av_log(NULL, AV_LOG_ERROR, "Invalid %s type '%s'\n", codec_string, name);
         exit(1);
     }
     return codec->id;

-- 
Libav/FFmpeg packaging