virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

10l, do not use ctx before being set, fix segv

Browse Source 
Originally committed as revision 13906 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-06-23 07:28:49 +00:00
parent dc3a6a368c
commit 3ab29d8e4f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffserver.c
View File

@ -2162,7 +2162,6 @@ static int http_prepare_data(HTTPContext *c)
AVStream *ist, *ost;
send_it:
ist = c->fmt_in->streams[source_index];
ost = ctx->streams[pkt.stream_index];
/* specific handling for RTP: we use several
output stream (one for each RTP
connection). XXX: need more abstract handling */
@ -2193,7 +2192,7 @@ static int http_prepare_data(HTTPContext *c)
} else {
ctx = &c->fmt_ctx;
/* Fudge here */
codec = ost->codec;
codec = ctx->streams[pkt.stream_index]->codec;
}
if (c->is_packetized) {
@ -2210,6 +2209,8 @@ static int http_prepare_data(HTTPContext *c)
/* XXX: potential leak */
return -1;
}
ost = ctx->streams[pkt.stream_index];
c->fmt_ctx.pb->is_streamed = 1;
if (pkt.dts != AV_NOPTS_VALUE)
pkt.dts = av_rescale_q(pkt.dts, ist->time_base, ost->time_base);