Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse source 
* qatar/master:
  avconv: Match stream id

Conflicts:
	cmdutils.c
	doc/fftools-common-opts.texi

See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-13 14:16:00 +01:00
commit bb6de15d92
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libavformat/utils.c
View file

@ -4468,12 +4468,14 @@ int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st,
return 1;
}
return 0;
} else if (*spec == '#') {
int sid;
} else if (*spec == '#' ||
(*spec == 'i' && *(spec + 1) == ':')) {
int stream_id;
char *endptr;
sid = strtol(spec + 1, &endptr, 0);
spec += 1 + (*spec == 'i');
stream_id = strtol(spec, &endptr, 0);
if (!*endptr)
return st->id == sid;
return stream_id == st->id;
} else if (!*spec) /* empty specifier, matches everything */
return 1;