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

Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'

Browse Source 
* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 23:00:01 +02:00
commit 5380c9afb9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/utils.c
View File

@ -4086,7 +4086,7 @@ int ff_find_stream_index(AVFormatContext *s, int id)
int64_t ff_iso8601_to_unix_time(const char *datestr) int64_t ff_iso8601_to_unix_time(const char *datestr)
{ {
struct tm time1 = { 0 }, time2 = { 0 }; struct tm time1 = { 0 }, time2 = { 0 };
char *ret1, *ret2; const char *ret1, *ret2;
ret1 = av_small_strptime(datestr, "%Y - %m - %d %T", &time1); ret1 = av_small_strptime(datestr, "%Y - %m - %d %T", &time1);
ret2 = av_small_strptime(datestr, "%Y - %m - %dT%T", &time2); ret2 = av_small_strptime(datestr, "%Y - %m - %dT%T", &time2);
if (ret2 && !ret1) if (ret2 && !ret1)