ffm_read_write_index returns a 64bit value,
Showing the changes to ffserver.c (1 of 1 file). Show all
Unified · Split
| @@ -2622,6 +2622,7 @@ static int http_start_receive_data(HTTPContext *c) · 2621 unmodified lines | |||
| 2622 | { | 2622 | { |
| 2623 | int fd; | 2623 | int fd; |
| 2624 | int ret; | 2624 | int ret; |
| 2625 | int64_t ret64; | ||
| 2625 | 2626 | ||
| 2626 | if (c->stream->feed_opened) { | 2627 | if (c->stream->feed_opened) { |
| 2627 | http_log("Stream feed '%s' was not opened\n", | 2628 | http_log("Stream feed '%s' was not opened\n", |
| @@ -2657,13 +2658,13 @@ static int http_start_receive_data(HTTPContext *c) · 29 unmodified lines | |||
| 2657 | return ret; | 2658 | return ret; |
| 2658 | } | 2659 | } |
| 2659 | } else { | 2660 | } else { |
| 2660 | ret = ffm_read_write_index(fd); | 2661 | ret64 = ffm_read_write_index(fd); |
| 2661 | if (ret < 0) { | 2662 | if (ret64 < 0) { |
| 2662 | http_log("Error reading write index from feed file '%s': %s\n", | 2663 | http_log("Error reading write index from feed file '%s': %s\n", |
| 2663 | c->stream->feed_filename, strerror(errno)); | 2664 | c->stream->feed_filename, strerror(errno)); |
| 2664 | return ret; | 2665 | return ret64; |
| 2665 | } | 2666 | } |
| 2666 | c->stream->feed_write_index = ret; | 2667 | c->stream->feed_write_index = ret64; |
| 2667 | } | 2668 | } |
| 2668 | 2669 | ||
| 2669 | c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), | 2670 | c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), |