RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify 

Originally committed as revision 13901 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-06-23 02:41:06 +00:00
parent e21ac20921
commit d80904cc87
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffserver.c
View File

@ -2159,7 +2159,8 @@ static int http_prepare_data(HTTPContext *c)
} }
} else { } else {
AVCodecContext *codec; AVCodecContext *codec;
AVStream *ist = c->fmt_in->streams[source_index];
AVStream *ost = ctx->streams[pkt.stream_index];
send_it: send_it:
/* specific handling for RTP: we use several /* specific handling for RTP: we use several
output stream (one for each RTP output stream (one for each RTP
@ -2193,7 +2194,7 @@ static int http_prepare_data(HTTPContext *c)
} else { } else {
ctx = &c->fmt_ctx; ctx = &c->fmt_ctx;
/* Fudge here */ /* Fudge here */
codec = ctx->streams[pkt.stream_index]->codec; codec = ost->codec;
} }
if (c->is_packetized) { if (c->is_packetized) {
@ -2212,16 +2213,10 @@ static int http_prepare_data(HTTPContext *c)
} }
c->fmt_ctx.pb->is_streamed = 1; c->fmt_ctx.pb->is_streamed = 1;
if (pkt.dts != AV_NOPTS_VALUE) if (pkt.dts != AV_NOPTS_VALUE)
pkt.dts = av_rescale_q(pkt.dts, pkt.dts = av_rescale_q(pkt.dts, ist->time_base, ost->time_base);
c->fmt_in->streams[source_index]->time_base,
ctx->streams[pkt.stream_index]->time_base);
if (pkt.pts != AV_NOPTS_VALUE) if (pkt.pts != AV_NOPTS_VALUE)
pkt.pts = av_rescale_q(pkt.pts, pkt.pts = av_rescale_q(pkt.pts, ist->time_base, ost->time_base);
c->fmt_in->streams[source_index]->time_base, pkt.duration = av_rescale_q(pkt.duration, ist->time_base, ost->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);
if (av_write_frame(ctx, &pkt) < 0) { if (av_write_frame(ctx, &pkt) < 0) {
http_log("Error writing frame to output\n"); http_log("Error writing frame to output\n");
c->state = HTTPSTATE_SEND_DATA_TRAILER; c->state = HTTPSTATE_SEND_DATA_TRAILER;