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

lavfi/src_movie: minor simplifications

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Lukasz Marek 2014-05-11 06:08:09 +02:00 committed by Michael Niedermayer
parent 9739255365
commit f753956252
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/src_movie.c
View File

@ -192,7 +192,7 @@ static av_cold int movie_common_init(AVFilterContext *ctx)
MovieContext *movie = ctx->priv; MovieContext *movie = ctx->priv;
AVInputFormat *iformat = NULL; AVInputFormat *iformat = NULL;
int64_t timestamp; int64_t timestamp;
int nb_streams, ret, i; int nb_streams = 1, ret, i;
char default_streams[16], *stream_specs, *spec, *cursor; char default_streams[16], *stream_specs, *spec, *cursor;
char name[16]; char name[16];
AVStream *st; AVStream *st;
@ -211,7 +211,7 @@ static av_cold int movie_common_init(AVFilterContext *ctx)
movie->stream_index); movie->stream_index);
stream_specs = default_streams; stream_specs = default_streams;
} }
for (cursor = stream_specs, nb_streams = 1; *cursor; cursor++) for (cursor = stream_specs; *cursor; cursor++)
if (*cursor == '+') if (*cursor == '+')
nb_streams++; nb_streams++;
@ -283,11 +283,9 @@ static av_cold int movie_common_init(AVFilterContext *ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i <= movie->max_stream_index; i++) for (i = 0; i <= movie->max_stream_index; i++)
movie->out_index[i] = -1; movie->out_index[i] = -1;
for (i = 0; i < nb_streams; i++)
movie->out_index[movie->st[i].st->index] = i;
for (i = 0; i < nb_streams; i++) { for (i = 0; i < nb_streams; i++) {
AVFilterPad pad = { 0 }; AVFilterPad pad = { 0 };
movie->out_index[movie->st[i].st->index] = i;
snprintf(name, sizeof(name), "out%d", i); snprintf(name, sizeof(name), "out%d", i);
pad.type = movie->st[i].st->codec->codec_type; pad.type = movie->st[i].st->codec->codec_type;
pad.name = av_strdup(name); pad.name = av_strdup(name);