diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-05 12:57:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-05 13:17:25 +0200 |
| commit | 9d4fdfe24c731d1880797dee65365154b41c1dea (patch) | |
| tree | 9b784b1eb89c43fce3059a92e7bc3a46a85de1ac /libavformat/matroskaenc.c | |
| parent | 7ac5c38ec5baeea6ad647ccc9bb7e97564c50ec2 (diff) | |
avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts
This reduces the number of cases where timestamps need to be shifted
Fixes Ticket4487
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6f55c69043..4e87eb0053 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -942,6 +942,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, // if there is no mkv-specific codec ID, use VFW mode put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC"); mkv->tracks[i].write_dts = 1; + s->internal->avoid_negative_ts_use_pts = 0; } subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0); @@ -1322,8 +1323,10 @@ static int mkv_write_header(AVFormatContext *s) else mkv->mode = MODE_MATROSKAv2; - if (s->avoid_negative_ts < 0) + if (s->avoid_negative_ts < 0) { s->avoid_negative_ts = 1; + s->internal->avoid_negative_ts_use_pts = 1; + } if (mkv->mode != MODE_WEBM || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || |