Originally committed as revision 13544 to svn://svn.ffmpeg.org/ffmpeg/trunk
Baptiste Coudurier authored on 2008/05/30 09:50:39... | ... |
@@ -2031,8 +2031,10 @@ static int http_prepare_data(HTTPContext *c) |
2031 | 2031 |
c->fmt_ctx.pb->is_streamed = 1; |
2032 | 2032 |
|
2033 | 2033 |
av_set_parameters(&c->fmt_ctx, NULL); |
2034 |
- if (av_write_header(&c->fmt_ctx) < 0) |
|
2034 |
+ if (av_write_header(&c->fmt_ctx) < 0) { |
|
2035 |
+ http_log("Error writing output header\n"); |
|
2035 | 2036 |
return -1; |
2037 |
+ } |
|
2036 | 2038 |
|
2037 | 2039 |
len = url_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer); |
2038 | 2040 |
c->buffer_ptr = c->pb_buffer; |
... | ... |
@@ -2349,8 +2351,10 @@ static int http_start_receive_data(HTTPContext *c) |
2349 | 2349 |
|
2350 | 2350 |
/* open feed */ |
2351 | 2351 |
fd = open(c->stream->feed_filename, O_RDWR); |
2352 |
- if (fd < 0) |
|
2352 |
+ if (fd < 0) { |
|
2353 |
+ http_log("Error opening feeder file: %s\n", strerror(errno)); |
|
2353 | 2354 |
return -1; |
2355 |
+ } |
|
2354 | 2356 |
c->feed_fd = fd; |
2355 | 2357 |
|
2356 | 2358 |
c->stream->feed_write_index = ffm_read_write_index(fd); |
... | ... |
@@ -2404,7 +2408,10 @@ static int http_receive_data(HTTPContext *c) |
2404 | 2404 |
// printf("writing pos=0x%"PRIx64" size=0x%"PRIx64"\n", feed->feed_write_index, feed->feed_size); |
2405 | 2405 |
/* XXX: use llseek or url_seek */ |
2406 | 2406 |
lseek(c->feed_fd, feed->feed_write_index, SEEK_SET); |
2407 |
- write(c->feed_fd, c->buffer, FFM_PACKET_SIZE); |
|
2407 |
+ if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) { |
|
2408 |
+ http_log("Error writing to feed file: %s\n", strerror(errno)); |
|
2409 |
+ goto fail; |
|
2410 |
+ } |
|
2408 | 2411 |
|
2409 | 2412 |
feed->feed_write_index += FFM_PACKET_SIZE; |
2410 | 2413 |
/* update file size */ |