diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-23 02:41:06 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-23 02:41:06 +0000 |
| commit | d80904cc87d8d0fce2e86bc48d650c6b47b60356 (patch) | |
| tree | eb3ec92ffcc355a5fa8cb29ba8be5636aa5f37d4 /ffserver.c | |
| parent | e21ac209213cc01c1e71cc94b1fdd514eecb2ab0 (diff) | |
| download | ffmpeg-d80904cc87d8d0fce2e86bc48d650c6b47b60356.tar.gz | |
simplify
Originally committed as revision 13901 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/ffserver.c b/ffserver.c index 20d22c0fa7..49abf25606 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2159,7 +2159,8 @@ static int http_prepare_data(HTTPContext *c) } } else { AVCodecContext *codec; - + AVStream *ist = c->fmt_in->streams[source_index]; + AVStream *ost = ctx->streams[pkt.stream_index]; send_it: /* specific handling for RTP: we use several output stream (one for each RTP @@ -2193,7 +2194,7 @@ static int http_prepare_data(HTTPContext *c) } else { ctx = &c->fmt_ctx; /* Fudge here */ - codec = ctx->streams[pkt.stream_index]->codec; + codec = ost->codec; } if (c->is_packetized) { @@ -2212,16 +2213,10 @@ static int http_prepare_data(HTTPContext *c) } c->fmt_ctx.pb->is_streamed = 1; if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts = av_rescale_q(pkt.dts, - c->fmt_in->streams[source_index]->time_base, - ctx->streams[pkt.stream_index]->time_base); + pkt.dts = av_rescale_q(pkt.dts, ist->time_base, ost->time_base); if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts = av_rescale_q(pkt.pts, - c->fmt_in->streams[source_index]->time_base, - ctx->streams[pkt.stream_index]->time_base); - pkt.duration = av_rescale_q(pkt.duration, - c->fmt_in->streams[source_index]->time_base, - ctx->streams[pkt.stream_index]->time_base); + pkt.pts = av_rescale_q(pkt.pts, ist->time_base, ost->time_base); + pkt.duration = av_rescale_q(pkt.duration, ist->time_base, ost->time_base); if (av_write_frame(ctx, &pkt) < 0) { http_log("Error writing frame to output\n"); c->state = HTTPSTATE_SEND_DATA_TRAILER; |