Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'

* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
  wtv: Avoid needlessly calling gmtime twice with the same argument

Conflicts:
	libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/wtvdec.c
index ee1ae1a,fa864e8..5012890
--- 1/libavformat/wtvdec.c
--- 2/libavformat/wtv.c
+++ b/libavformat/wtvdec.c
@@@ -387,10 -429,10 +387,10 @@@ static int filetime_to_iso8601(char *bu
  {
      time_t t = (value / 10000000LL) - 11644473600LL;
      struct tm *tm = gmtime(&t);
 -    if (tm)
 -        strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
 -    else
 -        buf[0] = '\0';
 +    if (!tm)
 +        return -1;
-     strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
++    strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
 +    return 0;
  }
  
  /**
@@@ -401,24 -442,23 +401,24 @@@ static int crazytime_to_iso8601(char *b
  {
      time_t t = (value / 10000000LL) - 719162LL*86400LL;
      struct tm *tm = gmtime(&t);
 -    if (tm)
 -        strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
 -    else
 -        buf[0] = '\0';
 +    if (!tm)
 +        return -1;
-     strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
++    strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
 +    return 0;
  }
  
  /**
   * Convert OLE DATE to ISO-8601 string
 + * @return <0 on error
   */
 -static void oledate_to_iso8601(char *buf, int buf_size, int64_t value)
 +static int oledate_to_iso8601(char *buf, int buf_size, int64_t value)
  {
 -    time_t t = 631112400LL + 86400*av_int2double(value);
 -    struct tm *tm = gmtime(&t);
 -    if (tm)
 -        strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
 -    else
 -        buf[0] = '\0';
 +    time_t t = (av_int2double(value) - 25569.0) * 86400;
-     struct tm *result= gmtime(&t);
-     if (!result)
++    struct tm *tm= gmtime(&t);
++    if (!tm)
 +        return -1;
-     strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", result);
++    strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
 +    return 0;
  }
  
  static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length)