From 12db891dcd57b305d6e3c1e22ea8204dc26edda1 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 15 Jun 2013 11:56:36 +0200 Subject: [PATCH] avf: move ff_write_chained to mux.c --- libavformat/mux.c | 18 ++++++++++++++++++ libavformat/utils.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index b51f906..96193dd 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -621,3 +621,21 @@ fail: av_freep(&s->priv_data); return ret; } + +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); + return av_write_frame(dst, &local_pkt); +} diff --git a/libavformat/utils.c b/libavformat/utils.c index 2bfff41..3ef8113 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3153,24 +3153,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); - 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) { -- 2.7.4