diff options
| author | Michael Niedermayer | 2014-06-18 18:18:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2014-06-18 19:49:17 +0200 |
| commit | ac293b66851f6c4461eab03ca91af59d5ee4e02e (patch) | |
| tree | 4bcf9e474aaec1e346c368660b52e4630059e380 /libavformat/oggenc.c | |
| parent | 88514378bac99872265dad28072fb30160b26bfa (diff) | |
| parent | 194be1f43ea391eb986732707435176e579265aa (diff) | |
Merge commit '194be1f43ea391eb986732707435176e579265aa'
* commit '194be1f43ea391eb986732707435176e579265aa':
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggenc.c')
| -rw-r--r-- | libavformat/oggenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 6c50fc3521..f6a6d7d96d 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -432,8 +432,8 @@ static int ogg_write_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, 48000); else avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); - } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den); + } + if (st->codec->codec_id != AV_CODEC_ID_VORBIS && st->codec->codec_id != AV_CODEC_ID_THEORA && st->codec->codec_id != AV_CODEC_ID_SPEEX && |