ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@gmail.com> | Mon May 18 05:11:34 2020 +0200| [b2c0b3774ffe1f6ad878a017b023691f7043168c] | committer: Andreas Rheinhardt
avformat/webmdashenc: Simplify parsing strings Don't use the functions for searching substrings when all one is looking for is a char anyway. Given that there is already a standard library function for "find last occurence of a char in a string" also allows one to remove a custom loop. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2c0b3774ffe1f6ad878a017b023691f7043168c --- libavformat/webmdashenc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 3101e0a039..eb286cab99 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -274,7 +274,6 @@ static int parse_filename(char *filename, char **representation_id, char **initialization_pattern, char **media_pattern) { char *underscore_pos = NULL; char *period_pos = NULL; - char *temp_pos = NULL; char *filename_str = av_strdup(filename); int ret = 0; @@ -282,16 +281,12 @@ static int parse_filename(char *filename, char **representation_id, ret = AVERROR(ENOMEM); goto end; } - temp_pos = av_stristr(filename_str, "_"); - while (temp_pos) { - underscore_pos = temp_pos + 1; - temp_pos = av_stristr(temp_pos + 1, "_"); - } + underscore_pos = strrchr(filename_str, '_'); if (!underscore_pos) { ret = AVERROR_INVALIDDATA; goto end; } - period_pos = av_stristr(underscore_pos, "."); + period_pos = strchr(++underscore_pos, '.'); if (!period_pos) { ret = AVERROR_INVALIDDATA; goto end; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
