diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-06-18 09:43:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-06-20 14:14:48 +0200 |
| commit | 452860d7e056f9a894cac2fe52cdedeae4c38251 (patch) | |
| tree | a994d3978e73b4ce695ac85304e9d0a895dd5412 | |
| parent | 874390e163427c1fe7682ab27924a7843780dbb3 (diff) | |
| download | ffmpeg-452860d7e056f9a894cac2fe52cdedeae4c38251.tar.gz | |
Use av_packet_rescale_ts() to simplify code.
| -rw-r--r-- | avconv.c | 21 | ||||
| -rw-r--r-- | doc/examples/output.c | 9 |
2 files changed, 4 insertions, 26 deletions
@@ -428,13 +428,7 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost, } if (got_packet) { - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base); - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base); - if (pkt.duration > 0) - pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base); - + av_packet_rescale_ts(&pkt, enc->time_base, ost->st->time_base); write_frame(s, &pkt, ost); } } @@ -587,11 +581,7 @@ static void do_video_out(AVFormatContext *s, } if (got_packet) { - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base); - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base); - + av_packet_rescale_ts(&pkt, enc->time_base, ost->st->time_base); write_frame(s, &pkt, ost); *frame_size = pkt.size; @@ -1044,12 +1034,7 @@ static void flush_encoders(void) stop_encoding = 1; break; } - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts = av_rescale_q(pkt.pts, enc->time_base, ost->st->time_base); - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts = av_rescale_q(pkt.dts, enc->time_base, ost->st->time_base); - if (pkt.duration > 0) - pkt.duration = av_rescale_q(pkt.duration, enc->time_base, ost->st->time_base); + av_packet_rescale_ts(&pkt, enc->time_base, ost->st->time_base); write_frame(os, &pkt, ost); } diff --git a/doc/examples/output.c b/doc/examples/output.c index dd0e6a224e..0239791e3d 100644 --- a/doc/examples/output.c +++ b/doc/examples/output.c @@ -362,14 +362,7 @@ static void write_video_frame(AVFormatContext *oc, AVStream *st) ret = avcodec_encode_video2(c, &pkt, picture, &got_packet); /* If size is zero, it means the image was buffered. */ if (!ret && got_packet && pkt.size) { - if (pkt.pts != AV_NOPTS_VALUE) { - pkt.pts = av_rescale_q(pkt.pts, - c->time_base, st->time_base); - } - if (pkt.dts != AV_NOPTS_VALUE) { - pkt.dts = av_rescale_q(pkt.dts, - c->time_base, st->time_base); - } + av_packet_rescale_ts(&pkt, c->time_base, st->time_base); pkt.stream_index = st->index; /* Write the compressed frame to the media file. */ |