aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2007-03-31 14:34:29 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2007-03-31 14:34:29 +0000
commit55d07ba68e39531b24bc3be27838c8b48b4f86f1 (patch)
tree681fb15d022c0ad2332ab82f43408188551b7c8a
parent30a1380a0477a1ef0ef9cfc857a706ad157f15b2 (diff)
downloadffmpeg-55d07ba68e39531b24bc3be27838c8b48b4f86f1.tar.gz
remove dead code
Originally committed as revision 8566 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffserver.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/ffserver.c b/ffserver.c
index 3c576dfc45..114aea4e60 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -85,9 +85,6 @@ const char *http_state[] = {
#define IOBUFFER_INIT_SIZE 8192
-/* coef for exponential mean for bitrate estimation in statistics */
-#define AVG_COEF 0.9
-
/* timeouts are in ms */
#define HTTP_REQUEST_TIMEOUT (15 * 1000)
#define RTSP_REQUEST_TIMEOUT (3600 * 24 * 1000)
@@ -2234,9 +2231,6 @@ static int http_prepare_data(HTTPContext *c)
return 0;
}
-/* in bit/s */
-#define SHORT_TERM_BANDWIDTH 8000000
-
/* should convert the format at the same time */
/* send data starting at c->buffer_ptr to the output connection
(either UDP or TCP connection) */
@@ -4433,25 +4427,6 @@ static int parse_ffconfig(const char *filename)
return 0;
}
-
-#if 0
-static void write_packet(FFCodec *ffenc,
- uint8_t *buf, int size)
-{
- PacketHeader hdr;
- AVCodecContext *enc = &ffenc->enc;
- uint8_t *wptr;
- mk_header(&hdr, enc, size);
- wptr = http_fifo.wptr;
- fifo_write(&http_fifo, (uint8_t *)&hdr, sizeof(hdr), &wptr);
- fifo_write(&http_fifo, buf, size, &wptr);
- /* atomic modification of wptr */
- http_fifo.wptr = wptr;
- ffenc->data_count += size;
- ffenc->avg_frame_size = ffenc->avg_frame_size * AVG_COEF + size * (1.0 - AVG_COEF);
-}
-#endif
-
static void show_banner(void)
{
printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2006 Fabrice Bellard, et al.\n");