mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-07 23:32:33 +00:00
fix timestamps rescaling, index in source format might be different
Originally committed as revision 13546 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
ddb41f3f58
commit
084a891292
@ -2078,6 +2078,7 @@ static int http_prepare_data(HTTPContext *c)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
int source_index = pkt.stream_index;
|
||||||
/* update first pts if needed */
|
/* update first pts if needed */
|
||||||
if (c->first_pts == AV_NOPTS_VALUE) {
|
if (c->first_pts == AV_NOPTS_VALUE) {
|
||||||
c->first_pts = av_rescale_q(pkt.dts, c->fmt_in->streams[pkt.stream_index]->time_base, AV_TIME_BASE_Q);
|
c->first_pts = av_rescale_q(pkt.dts, c->fmt_in->streams[pkt.stream_index]->time_base, AV_TIME_BASE_Q);
|
||||||
@ -2169,11 +2170,11 @@ 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,
|
||||||
c->fmt_in->streams[pkt.stream_index]->time_base,
|
c->fmt_in->streams[source_index]->time_base,
|
||||||
ctx->streams[pkt.stream_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,
|
||||||
c->fmt_in->streams[pkt.stream_index]->time_base,
|
c->fmt_in->streams[source_index]->time_base,
|
||||||
ctx->streams[pkt.stream_index]->time_base);
|
ctx->streams[pkt.stream_index]->time_base);
|
||||||
if (av_write_frame(ctx, &pkt))
|
if (av_write_frame(ctx, &pkt))
|
||||||
c->state = HTTPSTATE_SEND_DATA_TRAILER;
|
c->state = HTTPSTATE_SEND_DATA_TRAILER;
|
||||||
|
Loading…
Reference in New Issue
Block a user