Merge remote-tracking branch 'qatar/master'
* qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -484,7 +484,7 @@ static time_t mktimegm(struct tm *tm)
|
||||
return t;
|
||||
}
|
||||
|
||||
int av_parse_time(int64_t *timeval, const char *datestr, int duration)
|
||||
int av_parse_time(int64_t *timeval, const char *timestr, int duration)
|
||||
{
|
||||
const char *p;
|
||||
int64_t t;
|
||||
@@ -506,19 +506,19 @@ int av_parse_time(int64_t *timeval, const char *datestr, int duration)
|
||||
#undef time
|
||||
time_t now = time(0);
|
||||
|
||||
len = strlen(datestr);
|
||||
len = strlen(timestr);
|
||||
if (len > 0)
|
||||
lastch = datestr[len - 1];
|
||||
lastch = timestr[len - 1];
|
||||
else
|
||||
lastch = '\0';
|
||||
is_utc = (lastch == 'z' || lastch == 'Z');
|
||||
|
||||
memset(&dt, 0, sizeof(dt));
|
||||
|
||||
p = datestr;
|
||||
p = timestr;
|
||||
q = NULL;
|
||||
if (!duration) {
|
||||
if (!strncasecmp(datestr, "now", len)) {
|
||||
if (!strncasecmp(timestr, "now", len)) {
|
||||
*timeval = (int64_t) now * 1000000;
|
||||
return 0;
|
||||
}
|
||||
@@ -555,15 +555,15 @@ int av_parse_time(int64_t *timeval, const char *datestr, int duration)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* parse datestr as a duration */
|
||||
/* parse timestr as a duration */
|
||||
if (p[0] == '-') {
|
||||
negative = 1;
|
||||
++p;
|
||||
}
|
||||
/* parse datestr as HH:MM:SS */
|
||||
/* parse timestr as HH:MM:SS */
|
||||
q = small_strptime(p, time_fmt[0], &dt);
|
||||
if (!q) {
|
||||
/* parse datestr as S+ */
|
||||
/* parse timestr as S+ */
|
||||
dt.tm_sec = strtol(p, (char **)&q, 10);
|
||||
if (q == p) {
|
||||
/* the parsing didn't succeed */
|
||||
|
Reference in New Issue
Block a user