virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ogg: don't set codec timebase

Browse Source 
Demuxers are not supposed to set it.
This commit is contained in:
Anton Khirnov 2011-11-24 20:58:22 +01:00
parent 1d3144c318
commit 1bb3990b56
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/oggparseogm.c
View File

@ -80,9 +80,7 @@ ogm_header(AVFormatContext *s, int idx)
if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
st->codec->width = bytestream_get_le32(&p); st->codec->width = bytestream_get_le32(&p);
st->codec->height = bytestream_get_le32(&p); st->codec->height = bytestream_get_le32(&p);
st->codec->time_base.den = spu * 10000000; avpriv_set_pts_info(st, 64, spu * 10000000, time_unit);
st->codec->time_base.num = time_unit;
avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
} else { } else {
st->codec->channels = bytestream_get_le16(&p); st->codec->channels = bytestream_get_le16(&p);
p += 2; /* block_align */ p += 2; /* block_align */
@ -117,8 +115,7 @@ ogm_dshow_header(AVFormatContext *s, int idx)
if(t == 0x05589f80){ if(t == 0x05589f80){
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; 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->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
st->codec->time_base.den = 10000000; avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
st->codec->time_base.num = AV_RL64(p + 164);
st->codec->width = AV_RL32(p + 176); st->codec->width = AV_RL32(p + 176);
st->codec->height = AV_RL32(p + 180); st->codec->height = AV_RL32(p + 180);
} else if(t == 0x05589f81){ } else if(t == 0x05589f81){

13
libavformat/oggparsetheora.c
View File

@ -56,6 +56,7 @@ theora_header (AVFormatContext * s, int idx)
if (os->buf[os->pstart] == 0x80) { if (os->buf[os->pstart] == 0x80) {
GetBitContext gb; GetBitContext gb;
int width, height; int width, height;
AVRational timebase;
init_get_bits(&gb, os->buf + os->pstart, os->psize*8); init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
@ -85,14 +86,14 @@ theora_header (AVFormatContext * s, int idx)
skip_bits(&gb, 16); skip_bits(&gb, 16);
} }
st->codec->time_base.den = get_bits_long(&gb, 32); timebase.den = get_bits_long(&gb, 32);
st->codec->time_base.num = get_bits_long(&gb, 32); timebase.num = get_bits_long(&gb, 32);
if (!(st->codec->time_base.num > 0 && st->codec->time_base.den > 0)) { if (!(timebase.num > 0 && timebase.den > 0)) {
av_log(s, AV_LOG_WARNING, "Invalid time base in theora stream, assuming 25 FPS\n"); av_log(s, AV_LOG_WARNING, "Invalid time base in theora stream, assuming 25 FPS\n");
st->codec->time_base.num = 1; timebase.num = 1;
st->codec->time_base.den = 25; timebase.den = 25;
} }
avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den); avpriv_set_pts_info(st, 64, timebase.num, timebase.den);
st->sample_aspect_ratio.num = get_bits_long(&gb, 24); st->sample_aspect_ratio.num = get_bits_long(&gb, 24);
st->sample_aspect_ratio.den = get_bits_long(&gb, 24); st->sample_aspect_ratio.den = get_bits_long(&gb, 24);