diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 16:40:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 16:40:04 +0200 |
commit | 4a993335812f7e9b2088145c7d043c01019c5d04 (patch) | |
tree | 90fa4e0b4419c61d34111694e8ea64afd722ac8f /libavcodec/avpacket.c | |
parent | e93028790087e632569e94f193b333073a67cf14 (diff) | |
parent | 874390e163427c1fe7682ab27924a7843780dbb3 (diff) | |
download | ffmpeg-streaming-4a993335812f7e9b2088145c7d043c01019c5d04.zip ffmpeg-streaming-4a993335812f7e9b2088145c7d043c01019c5d04.tar.gz |
Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
* commit '874390e163427c1fe7682ab27924a7843780dbb3':
lavc: add a convenience function for rescaling timestamps in a packet
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avpacket.c')
-rw-r--r-- | libavcodec/avpacket.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 959d959..a87e8e3 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/internal.h" +#include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "avcodec.h" #include "bytestream.h" @@ -562,3 +563,15 @@ void av_packet_move_ref(AVPacket *dst, AVPacket *src) *dst = *src; av_init_packet(src); } + +void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb) +{ + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts = av_rescale_q(pkt->pts, src_tb, dst_tb); + if (pkt->dts != AV_NOPTS_VALUE) + pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb); + if (pkt->duration > 0) + pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb); + if (pkt->convergence_duration > 0) + pkt->convergence_duration = av_rescale_q(pkt->convergence_duration, src_tb, dst_tb); +} |