summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-03-12 02:31:44 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-03-12 02:31:59 (GMT)
commit9fcc62ed9bbf99c2acd55f3bdc9e8803711bdf30 (patch)
tree303f5c01ae63770d8eb1858ba15307ac0412195c
parent4272dc3ec5c56c46e88366c9a49a9a6aceb36e12 (diff)
downloadffmpeg-9fcc62ed9bbf99c2acd55f3bdc9e8803711bdf30.zip
ffmpeg-9fcc62ed9bbf99c2acd55f3bdc9e8803711bdf30.tar.gz
ffmpeg-9fcc62ed9bbf99c2acd55f3bdc9e8803711bdf30.tar.bz2
Revert "ffserver: remove unused variable."
This reverts commit f02f745e4aa070e5fabf1156b75c340171304933.
Diffstat
-rw-r--r--ffserver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index bddcb7d..5076339 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2127,12 +2127,13 @@ static int open_input_stream(HTTPContext *c, const char *info)
char buf[128];
char input_filename[1024];
AVFormatContext *s = NULL;
- int i, ret;
+ int buf_size, i, ret;
int64_t stream_pos;
/* find file name */
if (c->stream->feed) {
strcpy(input_filename, c->stream->feed->feed_filename);
+ buf_size = FFM_PACKET_SIZE;
/* compute position (absolute time) */
if (av_find_info_tag(buf, sizeof(buf), "date", info)) {
if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0)
@@ -2144,6 +2145,7 @@ static int open_input_stream(HTTPContext *c, const char *info)
stream_pos = av_gettime() - c->stream->prebuffer * (int64_t)1000;
} else {
strcpy(input_filename, c->stream->feed_filename);
+ buf_size = 0;
/* compute position (relative time) */
if (av_find_info_tag(buf, sizeof(buf), "date", info)) {
if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0)