diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 15:34:39 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 15:34:39 +0300 |
| commit | 198e55bfa791943fdd477778a8b39180dab52912 (patch) | |
| tree | 50ee89ea653c0584afe63f2df72b19292f480f90 /libavcodec/vorbisenc.c | |
| parent | b882079b1265066e5cc7c4415322919bea4c4651 (diff) | |
| parent | 5aa710f46119bb9c1c38542f80f5338eb8b5ffb2 (diff) | |
Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'
* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
vorbisenc: add missing parenthesis
Conflicts:
libavcodec/vorbisenc.c
See: f72b735d41f9591452d2efe0987040462b409c2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbisenc.c')
| -rw-r--r-- | libavcodec/vorbisenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 0f78d95ffd..c06093ea99 100644 --- 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; |