Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'

* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2': vorbisenc: add missing parenthesis Conflicts: libavcodec/vorbisenc.c See: f72b735d41 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 198e55bfa7
parent b882079b12 5aa710f461
commit 198e55bfa7
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@ -1094,8 +1094,9 @@ static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
    if (frame) {
        if (frame->pts != AV_NOPTS_VALUE)
            avpkt->pts = ff_samples_to_time_base(avctx, frame->pts);
-    } else
+    } else {
        avpkt->pts = venc->next_pts;
+    }
    if (avpkt->pts != AV_NOPTS_VALUE)
        venc->next_pts = avpkt->pts + avpkt->duration;