diff --git a/libavformat/mux.c b/libavformat/mux.c index 9b4b0b1249..34c9328c33 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -836,3 +836,25 @@ int av_get_output_timestamp(struct AVFormatContext *s, int stream, s->oformat->get_output_timestamp(s, stream, dts, wall); return 0; } + +int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, + AVFormatContext *src) +{ + AVPacket local_pkt; + + local_pkt = *pkt; + local_pkt.stream_index = dst_stream; + if (pkt->pts != AV_NOPTS_VALUE) + local_pkt.pts = av_rescale_q(pkt->pts, + src->streams[pkt->stream_index]->time_base, + dst->streams[dst_stream]->time_base); + if (pkt->dts != AV_NOPTS_VALUE) + local_pkt.dts = av_rescale_q(pkt->dts, + src->streams[pkt->stream_index]->time_base, + dst->streams[dst_stream]->time_base); + if (pkt->duration) + local_pkt.duration = av_rescale_q(pkt->duration, + src->streams[pkt->stream_index]->time_base, + dst->streams[dst_stream]->time_base); + return av_write_frame(dst, &local_pkt); +} diff --git a/libavformat/utils.c b/libavformat/utils.c index c955cf4bc3..a6b6f5368c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3884,28 +3884,6 @@ int ff_url_join(char *str, int size, const char *proto, return strlen(str); } -int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, - AVFormatContext *src) -{ - AVPacket local_pkt; - - local_pkt = *pkt; - local_pkt.stream_index = dst_stream; - if (pkt->pts != AV_NOPTS_VALUE) - local_pkt.pts = av_rescale_q(pkt->pts, - src->streams[pkt->stream_index]->time_base, - dst->streams[dst_stream]->time_base); - if (pkt->dts != AV_NOPTS_VALUE) - local_pkt.dts = av_rescale_q(pkt->dts, - src->streams[pkt->stream_index]->time_base, - dst->streams[dst_stream]->time_base); - if (pkt->duration) - local_pkt.duration = av_rescale_q(pkt->duration, - src->streams[pkt->stream_index]->time_base, - dst->streams[dst_stream]->time_base); - return av_write_frame(dst, &local_pkt); -} - void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, void *context) {