diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 17:03:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 17:03:58 +0200 |
| commit | afa7ab557a801d54a4c3dbab38350f858efbbd5f (patch) | |
| tree | d9bb2f47c96a4caecd7beb862c7eac92a2ccfff5 /doc | |
| parent | 4a993335812f7e9b2088145c7d043c01019c5d04 (diff) | |
| parent | 452860d7e056f9a894cac2fe52cdedeae4c38251 (diff) | |
| download | ffmpeg-afa7ab557a801d54a4c3dbab38350f858efbbd5f.tar.gz | |
Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
Use av_packet_rescale_ts() to simplify code.
Conflicts:
doc/examples/muxing.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/muxing.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index ad8e027148..19f4ba33a3 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -63,9 +63,7 @@ static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt) static int write_frame(AVFormatContext *fmt_ctx, const AVRational *time_base, AVStream *st, AVPacket *pkt) { /* rescale output packet timestamp values from codec to stream timebase */ - pkt->pts = av_rescale_q_rnd(pkt->pts, *time_base, st->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - pkt->dts = av_rescale_q_rnd(pkt->dts, *time_base, st->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - pkt->duration = av_rescale_q(pkt->duration, *time_base, st->time_base); + av_packet_rescale_ts(pkt, *time_base, st->time_base); pkt->stream_index = st->index; /* Write the compressed frame to the media file. */ |