History

ffserver: Fixed ffserver to support large ffm files

ffm_read_write_index returns a 64bit value,

Lior Mualem committed 10 years ago

Commit baec6d81 parent f2bdf9d1 file · +5 −4Browse files

Unified · Split

ffserver.c+5−4
@@ -2622,6 +2622,7 @@ static int http_start_receive_data(HTTPContext *c) · 2621 unmodified lines
26222622 {
26232623 int fd;
26242624 int ret;
2625+ int64_t ret64;
26252626
26262627 if (c->stream->feed_opened) {
26272628 http_log("Stream feed '%s' was not opened\n",
@@ -2657,13 +2658,13 @@ static int http_start_receive_data(HTTPContext *c) · 29 unmodified lines
26572658 return ret;
26582659 }
26592660 } else {
2660− ret = ffm_read_write_index(fd);
2661− if (ret < 0) {
2661+ ret64 = ffm_read_write_index(fd);
2662+ if (ret64 < 0) {
26622663 http_log("Error reading write index from feed file '%s': %s\n",
26632664 c->stream->feed_filename, strerror(errno));
2664− return ret;
2665+ return ret64;
26652666 }
2666− c->stream->feed_write_index = ret;
2667+ c->stream->feed_write_index = ret64;
26672668 }
26682669
26692670 c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t