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/avcodec.h | |
parent | e93028790087e632569e94f193b333073a67cf14 (diff) | |
parent | 874390e163427c1fe7682ab27924a7843780dbb3 (diff) |
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/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2579ccc971..f25636e610 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3806,6 +3806,19 @@ void av_packet_move_ref(AVPacket *dst, AVPacket *src); int av_packet_copy_props(AVPacket *dst, const AVPacket *src); /** + * Convert valid timing fields (timestamps / durations) in a packet from one + * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be + * ignored. + * + * @param pkt packet on which the conversion will be performed + * @param tb_src source timebase, in which the timing fields in pkt are + * expressed + * @param tb_dst destination timebase, to which the timing fields will be + * converted + */ +void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst); + +/** * @} */ |