[FFmpeg-cvslog] r25302 - trunk/ffmpeg.c
aurel
subversion
Fri Oct 1 23:52:09 CEST 2010
Author: aurel
Date: Fri Oct 1 23:52:09 2010
New Revision: 25302
Log:
ffmpeg: dynamically allocate stream_maps
Modified:
trunk/ffmpeg.c
Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c Fri Oct 1 23:51:12 2010 (r25301)
+++ trunk/ffmpeg.c Fri Oct 1 23:52:09 2010 (r25302)
@@ -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)
More information about the ffmpeg-cvslog
mailing list