[FFmpeg-cvslog] r13540 - trunk/ffserver.c
bcoudurier
subversion
Fri May 30 01:09:29 CEST 2008
Author: bcoudurier
Date: Fri May 30 01:09:29 2008
New Revision: 13540
Log:
cosmetics, move declaration where it is used, remove now useless block
Modified:
trunk/ffserver.c
Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c (original)
+++ trunk/ffserver.c Fri May 30 01:09:29 2008
@@ -2043,9 +2043,6 @@ static int http_prepare_data(HTTPContext
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
/* 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
av_free_packet(&pkt);
}
}
- }
break;
default:
case HTTPSTATE_SEND_DATA_TRAILER:
More information about the ffmpeg-cvslog
mailing list