diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-17 02:44:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-17 02:44:33 +0100 |
| commit | 8709ba907a7f6f44e392161221d9628fa74b22f6 (patch) | |
| tree | 027c6658a2d564cf9c8d2150fd5f14633e9e4d65 /libavutil | |
| parent | 4f7ad4c3e460a7dfe4e3186c73ad73db29336488 (diff) | |
| parent | 268fb3f9851590aed724dba83d3999c8369c929f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegaudiodec: Don't use a nonexistent log context for av_dlog
avformat: Accept the ISO8601 separate format as input, too
avformat: Interpret times in ff_iso8601_to_unix_time as UTC
avutil: Add av_timegm as a public function
cinepak: Add another special case so that it can handle the following file:
lagarith: add some RGBA decoding support
lagarith: Add correct line prediction for RGB
Conflicts:
doc/APIchanges
libavcodec/cinepak.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/parseutils.c | 4 | ||||
| -rw-r--r-- | libavutil/parseutils.h | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 72cfb8a3c0..0fa46b8230 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -40,7 +40,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index bf79921b7b..2649e3b2bc 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -471,7 +471,7 @@ static const char *small_strptime(const char *p, const char *fmt, struct tm *dt) } } -static time_t mktimegm(struct tm *tm) +time_t av_timegm(struct tm *tm) { time_t t; @@ -592,7 +592,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration) } else { dt.tm_isdst = -1; /* unknown */ if (is_utc) { - t = mktimegm(&dt); + t = av_timegm(&dt); } else { t = mktime(&dt); } diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index dfaec5eb9b..353e9a710e 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -19,6 +19,8 @@ #ifndef AVUTIL_PARSEUTILS_H #define AVUTIL_PARSEUTILS_H +#include <time.h> + #include "rational.h" /** @@ -114,4 +116,9 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration); */ int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info); +/** + * Convert the decomposed UTC time in tm to a time_t value. + */ +time_t av_timegm(struct tm *tm); + #endif /* AVUTIL_PARSEUTILS_H */ |