diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-23 08:12:15 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-23 08:12:15 +0000 |
| commit | ace21da3cf7b396df5702b3bf46f758156a0cb8f (patch) | |
| tree | 446c64bfd9c6a711c96707890332aae68267addc /ffserver.c | |
| parent | 51f90867ea389b630103cc692c5c0704fb95a73f (diff) | |
| download | ffmpeg-ace21da3cf7b396df5702b3bf46f758156a0cb8f.tar.gz | |
cosmetics, braces placement
Originally committed as revision 13908 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ffserver.c b/ffserver.c index cba4528592..ed9bb7fc5a 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1692,8 +1692,7 @@ static void compute_status(HTTPContext *c) stream->conns_served); fmt_bytecount(pb, stream->bytes_served); switch(stream->stream_type) { - case STREAM_TYPE_LIVE: - { + case STREAM_TYPE_LIVE: { int audio_bit_rate = 0; int video_bit_rate = 0; const char *audio_codec_name = ""; @@ -1931,13 +1930,11 @@ static int open_input_stream(HTTPContext *c, const char *info) strcpy(input_filename, c->stream->feed->feed_filename); buf_size = FFM_PACKET_SIZE; /* compute position (absolute time) */ - if (find_info_tag(buf, sizeof(buf), "date", info)) - { + if (find_info_tag(buf, sizeof(buf), "date", info)) { stream_pos = parse_date(buf, 0); if (stream_pos == INT64_MIN) return -1; - } - else if (find_info_tag(buf, sizeof(buf), "buffer", info)) { + } else if (find_info_tag(buf, sizeof(buf), "buffer", info)) { int prebuffer = strtol(buf, 0, 10); stream_pos = av_gettime() - prebuffer * (int64_t)1000000; } else @@ -1946,13 +1943,11 @@ static int open_input_stream(HTTPContext *c, const char *info) strcpy(input_filename, c->stream->feed_filename); buf_size = 0; /* compute position (relative time) */ - if (find_info_tag(buf, sizeof(buf), "date", info)) - { + if (find_info_tag(buf, sizeof(buf), "date", info)) { stream_pos = parse_date(buf, 1); if (stream_pos == INT64_MIN) return -1; - } - else + } else stream_pos = 0; } if (input_filename[0] == '\0') |