diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 05:00:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 05:00:17 +0400 |
| commit | 4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7 (patch) | |
| tree | 40c9d60ad11d718e5287ac030017475390441e38 /libavformat/oggenc.c | |
| parent | 320ce9f284171f8c8d8561cccd2186c27f24898c (diff) | |
| parent | eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0 (diff) | |
Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'
* commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0':
lavf: use initial_padding instead of deprecated delay
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggenc.c')
| -rw-r--r-- | libavformat/oggenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 4a54126f8f..fbbe320b21 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -582,7 +582,10 @@ static int ogg_write_packet_internal(AVFormatContext *s, AVPacket *pkt) } granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count; } else if (st->codec->codec_id == AV_CODEC_ID_OPUS) - granule = pkt->pts + pkt->duration + av_rescale_q(st->codec->delay, (AVRational){ 1, st->codec->sample_rate }, st->time_base); + granule = pkt->pts + pkt->duration + + av_rescale_q(st->codec->initial_padding, + (AVRational){ 1, st->codec->sample_rate }, + st->time_base); else granule = pkt->pts + pkt->duration; |