[SCM] libav/experimental: ffmpeg: dynamically allocate stream_maps

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:16:48 UTC 2013


The following commit has been merged in the experimental branch:
commit 3a8e882419920455cbd5d75af1d0d5d16aa7ddb9
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Oct 1 21:52:09 2010 +0000

    ffmpeg: dynamically allocate stream_maps
    
    Originally committed as revision 25302 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 3256d24..666d096 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -118,7 +118,7 @@ static AVCodec **output_codecs = NULL;
 static int nb_output_files = 0;
 static int nb_output_codecs = 0;
 
-static AVStreamMap stream_maps[MAX_FILES*MAX_STREAMS];
+static AVStreamMap *stream_maps = NULL;
 static int nb_stream_maps;
 
 static AVMetaDataMap meta_data_maps[MAX_FILES];
@@ -623,6 +623,7 @@ static int ffmpeg_exit(int ret)
     av_free(streamid_map);
     av_free(input_codecs);
     av_free(output_codecs);
+    av_free(stream_maps);
 
     av_free(video_codec_name);
     av_free(audio_codec_name);
@@ -3032,7 +3033,8 @@ static void opt_map(const char *arg)
     AVStreamMap *m;
     char *p;
 
-    m = &stream_maps[nb_stream_maps++];
+    stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1);
+    m = &stream_maps[nb_stream_maps-1];
 
     m->file_index = strtol(arg, &p, 0);
     if (*p)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list