Skip to content

Commit

Permalink
Revert "ffmpeg: get rid of a pointless limit on number of streams."
Browse files Browse the repository at this point in the history
This reverts commit c7dd3e7

Conflicts:

	ffmpeg.c
  • Loading branch information
michaelni committed Jul 16, 2011
1 parent b57df29 commit c31a5b2
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion ffmpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -3220,6 +3220,9 @@ static int opt_input_ts_scale(const char *opt, const char *arg)
p++;
scale= strtod(p, &p);

if(stream >= MAX_STREAMS)
ffmpeg_exit(1);

ts_scale = grow_array(ts_scale, sizeof(*ts_scale), &nb_ts_scale, stream + 1);
ts_scale[stream] = scale;
return 0;
Expand Down Expand Up @@ -3849,7 +3852,7 @@ static int opt_streamid(const char *opt, const char *arg)
ffmpeg_exit(1);
}
*p++ = '\0';
idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX);
idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1);
streamid_map = grow_array(streamid_map, sizeof(*streamid_map), &nb_streamid_map, idx+1);
streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX);
return 0;
Expand Down

0 comments on commit c31a5b2

Please sign in to comment.