From 1cb4d12c72fb9cac009f043eab34068946e2350c Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 29 May 2008 23:09:29 +0000 Subject: cosmetics, move declaration where it is used, remove now useless block Originally committed as revision 13540 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ffserver.c') diff --git a/ffserver.c b/ffserver.c index 705c557352..04e0d2a782 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2043,9 +2043,6 @@ static int http_prepare_data(HTTPContext *c) break; case HTTPSTATE_SEND_DATA: /* find a new packet */ - { - AVPacket pkt; - /* read a packet from the input stream */ if (c->stream->feed) ffm_set_write_index(c->fmt_in, @@ -2057,6 +2054,7 @@ static int http_prepare_data(HTTPContext *c) /* We have timed out */ c->state = HTTPSTATE_SEND_DATA_TRAILER; else { + AVPacket pkt; redo: if (av_read_frame(c->fmt_in, &pkt) < 0) { if (c->stream->feed && c->stream->feed->feed_opened) { @@ -2191,7 +2189,6 @@ static int http_prepare_data(HTTPContext *c) av_free_packet(&pkt); } } - } break; default: case HTTPSTATE_SEND_DATA_TRAILER: -- cgit v1.2.3