summaryrefslogtreecommitdiff
path: root/libavformat/oggparseogm.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-11-24 20:58:22 +0100
committerAnton Khirnov <anton@khirnov.net>2012-03-02 11:11:38 +0100
commit1bb3990b560e7ff7f46c06c14f959fe432e0b625 (patch)
treeb23877492cf9cf2739a17cec375fd8f7146a3d36 /libavformat/oggparseogm.c
parent1d3144c318f0b6f99bf912344bb0e005b2b05708 (diff)
ogg: don't set codec timebase
Demuxers are not supposed to set it.
Diffstat (limited to 'libavformat/oggparseogm.c')
-rw-r--r--libavformat/oggparseogm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 0a8a7c6bd4..f16eb13039 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -80,9 +80,7 @@ ogm_header(AVFormatContext *s, int idx)
if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
st->codec->width = bytestream_get_le32(&p);
st->codec->height = bytestream_get_le32(&p);
- st->codec->time_base.den = spu * 10000000;
- st->codec->time_base.num = time_unit;
- avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
+ avpriv_set_pts_info(st, 64, spu * 10000000, time_unit);
} else {
st->codec->channels = bytestream_get_le16(&p);
p += 2; /* block_align */
@@ -117,8 +115,7 @@ ogm_dshow_header(AVFormatContext *s, int idx)
if(t == 0x05589f80){
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
- st->codec->time_base.den = 10000000;
- st->codec->time_base.num = AV_RL64(p + 164);
+ avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
st->codec->width = AV_RL32(p + 176);
st->codec->height = AV_RL32(p + 180);
} else if(t == 0x05589f81){