diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 13:40:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 13:43:04 +0200 |
| commit | 4991eacc064f5edd3acba4ce0d9e0ce27cee2b42 (patch) | |
| tree | 7b45f36cd6789d613816138322bce99088a46cfc /libavformat/matroskaenc.c | |
| parent | e46cc1dab05e366feaf98efc9bd2d57e2fa58410 (diff) | |
| parent | 962d63157322466a9a82f9f9d84c1b6f1b582f65 (diff) | |
| download | ffmpeg-4991eacc064f5edd3acba4ce0d9e0ce27cee2b42.tar.gz | |
Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'
* commit '962d63157322466a9a82f9f9d84c1b6f1b582f65':
matroskaenc: set the stream timebase earlier
Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c139339634..846c447956 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -681,6 +681,9 @@ static int mkv_write_tracks(AVFormatContext *s) int display_height_div = 1; AVDictionaryEntry *tag; + // ms precision is the de-facto standard timescale for mkv files + avpriv_set_pts_info(st, 64, 1, 1000); + if (codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) { mkv->have_attachments = 1; continue; @@ -900,9 +903,6 @@ static int mkv_write_tracks(AVFormatContext *s) } end_ebml_master(pb, track); - - // ms precision is the de-facto standard timescale for mkv files - avpriv_set_pts_info(st, 64, 1, 1000); } end_ebml_master(pb, tracks); return 0; |