diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 03:00:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 03:00:17 +0200 |
| commit | 4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7 (patch) | |
| tree | 40c9d60ad11d718e5287ac030017475390441e38 /libavformat/matroskaenc.c | |
| parent | 320ce9f284171f8c8d8561cccd2186c27f24898c (diff) | |
| parent | eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0 (diff) | |
| download | ffmpeg-streaming-4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7.zip ffmpeg-streaming-4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7.tar.gz | |
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/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 00a0c18..a0b5950 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -870,13 +870,14 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } } - if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->delay && codec->codec_id == AV_CODEC_ID_OPUS) { -// mkv->tracks[i].ts_offset = av_rescale_q(codec->delay, + if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->initial_padding && codec->codec_id == AV_CODEC_ID_OPUS) { +// mkv->tracks[i].ts_offset = av_rescale_q(codec->initial_padding, // (AVRational){ 1, codec->sample_rate }, // st->time_base); 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 })); } if (codec->codec_id == AV_CODEC_ID_OPUS) { |
