[SCM] libav/experimental: print fourcc in a readable form if possible

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b983a5c60829ff56bbbc44f101a348021d9c2da0
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Sep 3 20:36:24 2005 +0000

    print fourcc in a readable form if possible
    
    Originally committed as revision 4554 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ec234f6..70a3ce7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -767,12 +767,14 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
         codec_name = enc->codec_name;
     } else {
         /* output avi tags */
-        if (enc->codec_type == CODEC_TYPE_VIDEO) {
-            snprintf(buf1, sizeof(buf1), "%c%c%c%c", 
+        if(   isprint(enc->codec_tag&0xFF) && isprint((enc->codec_tag>>8)&0xFF) 
+           && isprint((enc->codec_tag>>16)&0xFF) && isprint((enc->codec_tag>>24)&0xFF)){
+            snprintf(buf1, sizeof(buf1), "%c%c%c%c / 0x%04X", 
                      enc->codec_tag & 0xff,
                      (enc->codec_tag >> 8) & 0xff,
                      (enc->codec_tag >> 16) & 0xff,
-                     (enc->codec_tag >> 24) & 0xff);
+                     (enc->codec_tag >> 24) & 0xff,
+                      enc->codec_tag);
         } else {
             snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag);
         }

-- 
Libav/FFmpeg packaging