generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: dynamically allocate stream_maps

Browse Source 
Originally committed as revision 25302 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2010-10-01 21:52:09 +00:00
parent 0a6d97b371
commit 3a8e882419
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@@ -118,7 +118,7 @@ static AVCodec **output_codecs = NULL;
static int nb_output_files = 0; static int nb_output_files = 0;
static int nb_output_codecs = 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 int nb_stream_maps;
static AVMetaDataMap meta_data_maps[MAX_FILES]; static AVMetaDataMap meta_data_maps[MAX_FILES];
@@ -623,6 +623,7 @@ static int ffmpeg_exit(int ret)
av_free(streamid_map); av_free(streamid_map);
av_free(input_codecs); av_free(input_codecs);
av_free(output_codecs); av_free(output_codecs);
av_free(stream_maps);
av_free(video_codec_name); av_free(video_codec_name);
av_free(audio_codec_name); av_free(audio_codec_name);
@@ -3032,7 +3033,8 @@ static void opt_map(const char *arg)
AVStreamMap *m; AVStreamMap *m;
char *p; 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); m->file_index = strtol(arg, &p, 0);
if (*p) if (*p)