aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-03-21 10:29:37 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-03-21 10:29:37 +0000
commit1f611549e2c2e6d485df93e4dd5a982104c110f3 (patch)
treee9c0e40553f8984ce7180699de887b9b6d934d29
parent861ec13aae31cb59b2d7fe8c0b32d128093c9718 (diff)
downloadffmpeg-1f611549e2c2e6d485df93e4dd5a982104c110f3.tar.gz
cosmetics, reindent and remove empty line
Originally committed as revision 18108 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffserver.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ffserver.c b/ffserver.c
index f84c1a133c..8d77b94453 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2438,14 +2438,13 @@ static int http_start_receive_data(HTTPContext *c)
ftruncate(c->feed_fd, FFM_PACKET_SIZE);
http_log("Truncating feed file '%s'\n", c->stream->feed_filename);
} else {
- if ((c->stream->feed_write_index = ffm_read_write_index(fd)) < 0) {
- http_log("Error reading write index from feed file: %s\n", strerror(errno));
- return -1;
- }
+ if ((c->stream->feed_write_index = ffm_read_write_index(fd)) < 0) {
+ http_log("Error reading write index from feed file: %s\n", strerror(errno));
+ return -1;
+ }
}
c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), FFM_PACKET_SIZE);
-
c->stream->feed_size = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);