RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-21 14:26:59 +00:00
Code Issues Projects Releases Wiki Activity

lavf: use initial_padding instead of deprecated delay

Browse Source
This commit is contained in:
Anton Khirnov 2014-08-23 13:12:51 +00:00
parent 2df0c32ea1
commit eabdc2a830
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/matroskaenc.c
View File

@ -742,13 +742,14 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
if (!(st->disposition & AV_DISPOSITION_DEFAULT)) if (!(st->disposition & AV_DISPOSITION_DEFAULT))
put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT)); put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->delay) { if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->initial_padding) {
mkv->tracks[i].ts_offset = av_rescale_q(codec->delay, mkv->tracks[i].ts_offset = av_rescale_q(codec->initial_padding,
(AVRational){ 1, codec->sample_rate }, (AVRational){ 1, codec->sample_rate },
st->time_base); st->time_base);
put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, put_ebml_uint(pb, MATROSKA_ID_CODECDELAY,
av_rescale_q(codec->delay, (AVRational){ 1, codec->sample_rate }, av_rescale_q(codec->initial_padding,
(AVRational){ 1, codec->sample_rate },
(AVRational){ 1, 1000000000 })); (AVRational){ 1, 1000000000 }));
} }

5
libavformat/oggenc.c
View File

@ -564,7 +564,10 @@ static int ogg_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
} }
granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count; granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count;
} else if (st->codec->codec_id == AV_CODEC_ID_OPUS) } 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 else
granule = pkt->pts + pkt->duration; granule = pkt->pts + pkt->duration;