diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-03-12 15:16:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-03-12 15:16:19 +0000 |
| commit | 14bea432f16d7c66f9099e427819028b6b4c3bdc (patch) | |
| tree | c52726ce14a0265337b9deebd2214e2552d284b0 /libavformat/rm.c | |
| parent | 586bc7553ca90dee507afd950de64bbd2c6a80b5 (diff) | |
| download | ffmpeg-14bea432f16d7c66f9099e427819028b6b4c3bdc.tar.gz | |
per context frame_rate_base, this should finally fix frame_rate related av sync issues
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rm.c')
| -rw-r--r-- | libavformat/rm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rm.c b/libavformat/rm.c index f5ae3a3f33..47b510b323 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -306,7 +306,7 @@ static int rm_write_header(AVFormatContext *s) break; case CODEC_TYPE_VIDEO: rm->video_stream = stream; - stream->frame_rate = (float)codec->frame_rate / (float)FRAME_RATE_BASE; + stream->frame_rate = (float)codec->frame_rate / (float)codec->frame_rate_base; /* XXX: dummy values */ stream->packet_max_size = 4096; stream->nb_packets = 0; @@ -582,7 +582,8 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) goto fail1; st->codec.width = get_be16(pb); st->codec.height = get_be16(pb); - st->codec.frame_rate = get_be16(pb) * FRAME_RATE_BASE; + st->codec.frame_rate_base= 1; + st->codec.frame_rate = get_be16(pb) * st->codec.frame_rate_base; st->codec.codec_type = CODEC_TYPE_VIDEO; get_be32(pb); get_be16(pb); |