Message ID | AM7PR03MB66602498951DFAE9EF3378C98F6E9@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | a33e0ed11e72c9463dcfee240aa7cf5c2a57b102 |
Headers | show |
Series | [FFmpeg-devel,1/2] avformat/utils: Fix wrong indentation | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavformat/utils.c | 34 +++++++++++++++++----------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/libavformat/utils.c b/libavformat/utils.c > index 7840e8717c..827e7c8d5a 100644 > --- a/libavformat/utils.c > +++ b/libavformat/utils.c > @@ -1479,23 +1479,23 @@ static int match_stream_specifier(AVFormatContext *s, AVStream *st, > int ret; > > if (match) { > - spec += 2; > - val = strchr(spec, ':'); > - > - key = val ? av_strndup(spec, val - spec) : av_strdup(spec); > - if (!key) > - return AVERROR(ENOMEM); > - > - tag = av_dict_get(st->metadata, key, NULL, 0); > - if (tag) { > - if (!val || !strcmp(tag->value, val + 1)) > - ret = 1; > - else > - ret = 0; > - } else > - ret = 0; > - > - av_freep(&key); > + spec += 2; > + val = strchr(spec, ':'); > + > + key = val ? av_strndup(spec, val - spec) : av_strdup(spec); > + if (!key) > + return AVERROR(ENOMEM); > + > + tag = av_dict_get(st->metadata, key, NULL, 0); > + if (tag) { > + if (!val || !strcmp(tag->value, val + 1)) > + ret = 1; > + else > + ret = 0; > + } else > + ret = 0; > + > + av_freep(&key); > } > return match && ret; > } else if (*spec == 'u' && *(spec + 1) == '\0') { > Will apply this patchset tonight unless there are objections. - Andreas
diff --git a/libavformat/utils.c b/libavformat/utils.c index 7840e8717c..827e7c8d5a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1479,23 +1479,23 @@ static int match_stream_specifier(AVFormatContext *s, AVStream *st, int ret; if (match) { - spec += 2; - val = strchr(spec, ':'); - - key = val ? av_strndup(spec, val - spec) : av_strdup(spec); - if (!key) - return AVERROR(ENOMEM); - - tag = av_dict_get(st->metadata, key, NULL, 0); - if (tag) { - if (!val || !strcmp(tag->value, val + 1)) - ret = 1; - else - ret = 0; - } else - ret = 0; - - av_freep(&key); + spec += 2; + val = strchr(spec, ':'); + + key = val ? av_strndup(spec, val - spec) : av_strdup(spec); + if (!key) + return AVERROR(ENOMEM); + + tag = av_dict_get(st->metadata, key, NULL, 0); + if (tag) { + if (!val || !strcmp(tag->value, val + 1)) + ret = 1; + else + ret = 0; + } else + ret = 0; + + av_freep(&key); } return match && ret; } else if (*spec == 'u' && *(spec + 1) == '\0') {
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavformat/utils.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)