[SCM] libav/experimental: * using some small char buffer - needed for sprintf

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:31:30 UTC 2013


The following commit has been merged in the experimental branch:
commit 623563c04a8d32b520bb4fed52851338976daa4d
Author: Zdenek Kabelac <kabi at informatics.muni.cz>
Date:   Mon Apr 22 19:57:26 2002 +0000

    * using some small char buffer - needed for sprintf
    
    Originally committed as revision 416 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a1df408..7240f20 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -219,7 +219,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
     const char *codec_name;
     AVCodec *p;
     char buf1[32];
-    char *channels_str=NULL;
+    char channels_str[100];
     int bitrate;
 
     if (encode)
@@ -272,13 +272,13 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
                  codec_name);
         switch (enc->channels) {
             case 1:
-                channels_str = "mono";
+                strcpy(channels_str, "mono");
                 break;
             case 2:
-                channels_str = "stereo";
+                strcpy(channels_str, "stereo");
                 break;
             case 6:
-                channels_str = "5:1";
+                strcpy(channels_str, "5:1");
                 break;
             default:
                 sprintf(channels_str, "%d channels", enc->channels);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list