Revision 9fcae973 ffserver.c

View differences:

ffserver.c
2136 2136
        buf_size = FFM_PACKET_SIZE;
2137 2137
        /* compute position (absolute time) */
2138 2138
        if (find_info_tag(buf, sizeof(buf), "date", info)) {
2139
            stream_pos = parse_date(buf, 0);
2140
            if (stream_pos == INT64_MIN)
2141
                return -1;
2139
            if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0)
2140
                return ret;
2142 2141
        } else if (find_info_tag(buf, sizeof(buf), "buffer", info)) {
2143 2142
            int prebuffer = strtol(buf, 0, 10);
2144 2143
            stream_pos = av_gettime() - prebuffer * (int64_t)1000000;
......
2149 2148
        buf_size = 0;
2150 2149
        /* compute position (relative time) */
2151 2150
        if (find_info_tag(buf, sizeof(buf), "date", info)) {
2152
            stream_pos = parse_date(buf, 1);
2153
            if (stream_pos == INT64_MIN)
2154
                return -1;
2151
            if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0)
2152
                return ret;
2155 2153
        } else
2156 2154
            stream_pos = 0;
2157 2155
    }

Also available in: Unified diff