[SCM] libav/experimental: 100l, fix dump_format, declare buf in dump_stream_format, sizeof(buf) is 4 because buf is char* since r10818

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:08:37 UTC 2013


The following commit has been merged in the experimental branch:
commit 4e745a3b28a4b2ab009e7e6fe40f2d0457fa2a63
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Oct 21 23:10:15 2007 +0000

    100l, fix dump_format, declare buf in dump_stream_format, sizeof(buf) is 4 because buf is char* since r10818
    
    Originally committed as revision 10832 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d1480a2..3b8c264 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2508,8 +2508,9 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int i
 }
 
 /* "user interface" functions */
-static void dump_stream_format(AVFormatContext *ic, int i, int index, char *buf, int is_output)
+static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
 {
+    char buf[256];
     int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
     AVStream *st = ic->streams[i];
     int g = ff_gcd(st->time_base.num, st->time_base.den);
@@ -2540,7 +2541,6 @@ void dump_format(AVFormatContext *ic,
                  int is_output)
 {
     int i, flags;
-    char buf[256];
 
     av_log(NULL, AV_LOG_INFO, "%s #%d, %s, %s '%s':\n",
             is_output ? "Output" : "Input",
@@ -2585,11 +2585,11 @@ void dump_format(AVFormatContext *ic,
             if(ic->programs[j]->name)
                 av_log(NULL, AV_LOG_INFO, " \"%s\"\n", ic->programs[j]->name);
             for(k=0; k<ic->programs[j]->nb_stream_indexes; k++)
-                dump_stream_format(ic, ic->programs[j]->stream_index[k], index, buf, is_output);
+                dump_stream_format(ic, ic->programs[j]->stream_index[k], index, is_output);
          }
     } else
     for(i=0;i<ic->nb_streams;i++)
-        dump_stream_format(ic, i, index, buf, is_output);
+        dump_stream_format(ic, i, index, is_output);
 }
 
 int parse_image_size(int *width_ptr, int *height_ptr, const char *str)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list