Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

cosmetics, move declaration where it is used, remove now useless block

Browse source 
Originally committed as revision 13540 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-29 23:09:29 +00:00
parent 9d58e0a9e1
commit 1cb4d12c72
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ffserver.c
View file

@ -2043,9 +2043,6 @@ static int http_prepare_data(HTTPContext *c)
break; break;
case HTTPSTATE_SEND_DATA: case HTTPSTATE_SEND_DATA:
/* find a new packet */ /* find a new packet */
{
AVPacket pkt;
/* read a packet from the input stream */ /* read a packet from the input stream */
if (c->stream->feed) if (c->stream->feed)
ffm_set_write_index(c->fmt_in, ffm_set_write_index(c->fmt_in,
@ -2057,6 +2054,7 @@ static int http_prepare_data(HTTPContext *c)
/* We have timed out */ /* We have timed out */
c->state = HTTPSTATE_SEND_DATA_TRAILER; c->state = HTTPSTATE_SEND_DATA_TRAILER;
else { else {
AVPacket pkt;
redo: redo:
if (av_read_frame(c->fmt_in, &pkt) < 0) { if (av_read_frame(c->fmt_in, &pkt) < 0) {
if (c->stream->feed && c->stream->feed->feed_opened) { if (c->stream->feed && c->stream->feed->feed_opened) {
@ -2191,7 +2189,6 @@ static int http_prepare_data(HTTPContext *c)
av_free_packet(&pkt); av_free_packet(&pkt);
} }
} }
}
break; break;
default: default:
case HTTPSTATE_SEND_DATA_TRAILER: case HTTPSTATE_SEND_DATA_TRAILER: