eden-emu/FFmpeg
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2011-11-17 02:44:33 +01:00
commit 8709ba907a
7 changed files with 95 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavutil/parseutils.c
View file

@ -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);
}