Mercurial > libavformat.hg
comparison raw.c @ 743:af4e24d6310c libavformat
switch to native time bases
author | michael |
---|---|
date | Sat, 30 Apr 2005 21:43:59 +0000 |
parents | e2687b784c3a |
children | a03f1f7497ad |
comparison
equal
deleted
inserted
replaced
742:21c1ae78f041 | 743:af4e24d6310c |
---|---|
61 st->codec.sample_rate = ap->sample_rate; | 61 st->codec.sample_rate = ap->sample_rate; |
62 st->codec.channels = ap->channels; | 62 st->codec.channels = ap->channels; |
63 av_set_pts_info(st, 64, 1, st->codec.sample_rate); | 63 av_set_pts_info(st, 64, 1, st->codec.sample_rate); |
64 break; | 64 break; |
65 case CODEC_TYPE_VIDEO: | 65 case CODEC_TYPE_VIDEO: |
66 st->codec.frame_rate = ap->frame_rate; | 66 av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); |
67 st->codec.frame_rate_base = ap->frame_rate_base; | |
68 st->codec.width = ap->width; | 67 st->codec.width = ap->width; |
69 st->codec.height = ap->height; | 68 st->codec.height = ap->height; |
70 st->codec.pix_fmt = ap->pix_fmt; | 69 st->codec.pix_fmt = ap->pix_fmt; |
71 break; | 70 break; |
72 default: | 71 default: |
236 | 235 |
237 /* for mjpeg, specify frame rate */ | 236 /* for mjpeg, specify frame rate */ |
238 /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/ | 237 /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/ |
239 if (st->codec.codec_id == CODEC_ID_MJPEG || | 238 if (st->codec.codec_id == CODEC_ID_MJPEG || |
240 st->codec.codec_id == CODEC_ID_MPEG4) { | 239 st->codec.codec_id == CODEC_ID_MPEG4) { |
241 if (ap && ap->frame_rate) { | 240 if (ap && ap->time_base.num) { |
242 st->codec.frame_rate = ap->frame_rate; | 241 av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); |
243 st->codec.frame_rate_base = ap->frame_rate_base; | |
244 } else { | 242 } else { |
245 st->codec.frame_rate = 25; | 243 av_set_pts_info(st, 64, 1, 25); |
246 st->codec.frame_rate_base = 1; | |
247 } | 244 } |
248 } | 245 } |
249 return 0; | 246 return 0; |
250 } | 247 } |
251 | 248 |