mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'
* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
vorbisenc: add missing parenthesis
Conflicts:
libavcodec/vorbisenc.c
See: f72b735d41
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
198e55bfa7
|
@ -1094,8 +1094,9 @@ static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
||||||
if (frame) {
|
if (frame) {
|
||||||
if (frame->pts != AV_NOPTS_VALUE)
|
if (frame->pts != AV_NOPTS_VALUE)
|
||||||
avpkt->pts = ff_samples_to_time_base(avctx, frame->pts);
|
avpkt->pts = ff_samples_to_time_base(avctx, frame->pts);
|
||||||
} else
|
} else {
|
||||||
avpkt->pts = venc->next_pts;
|
avpkt->pts = venc->next_pts;
|
||||||
|
}
|
||||||
if (avpkt->pts != AV_NOPTS_VALUE)
|
if (avpkt->pts != AV_NOPTS_VALUE)
|
||||||
venc->next_pts = avpkt->pts + avpkt->duration;
|
venc->next_pts = avpkt->pts + avpkt->duration;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue