diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-06-27 19:47:23 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-06-27 21:59:57 -0300 |
| commit | 45cfecdec645e0db0d2b8c76d6ece3860ab97c5b (patch) | |
| tree | 35a015aed424146268ead11f9e1fc4c69e630bdf /libavformat/mux.c | |
| parent | 2b15d436db3ff13c9f87b1396cbe6dad54a50860 (diff) | |
| download | ffmpeg-45cfecdec645e0db0d2b8c76d6ece3860ab97c5b.tar.gz | |
libavformat/mux: Fix mixed delarations and code
This commit fixes mixed declarations and code introduced in 1889e316.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 5e1ecd8485..21f10caf53 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1005,10 +1005,11 @@ static int interleave_compare_dts(AVFormatContext *s, AVPacket *next, int preload = st ->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; int preload2 = st2->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; if (preload != preload2) { + int64_t ts, ts2; preload *= s->audio_preload; preload2 *= s->audio_preload; - int64_t ts = av_rescale_q(pkt ->dts, st ->time_base, AV_TIME_BASE_Q) - preload; - int64_t ts2= av_rescale_q(next->dts, st2->time_base, AV_TIME_BASE_Q) - preload2; + ts = av_rescale_q(pkt ->dts, st ->time_base, AV_TIME_BASE_Q) - preload; + ts2= av_rescale_q(next->dts, st2->time_base, AV_TIME_BASE_Q) - preload2; if (ts == ts2) { ts = ((uint64_t)pkt ->dts*st ->time_base.num*AV_TIME_BASE - (uint64_t)preload *st ->time_base.den)*st2->time_base.den - ((uint64_t)next->dts*st2->time_base.num*AV_TIME_BASE - (uint64_t)preload2*st2->time_base.den)*st ->time_base.den; |