On 6/27/2019 2:47 PM, Andreas Rheinhardt wrote:
> This commit fixes mixed declarations and code introduced in 1889e316.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
> ---
> Sorry for the oversight.
>
> libavformat/mux.c | 5 +++--
> 1 file 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;
Pushed, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
