Mercurial > libavcodec.hg
comparison mpeg12.c @ 9059:3c5920f57063 libavcodec
Add ticks_per_frame, this should hopefully fix the regressions caused
by the time_base change.
| author | michael |
|---|---|
| date | Thu, 26 Feb 2009 23:47:32 +0000 |
| parents | a56d79b0b9fb |
| children | 390f5a9721d2 |
comparison
equal
deleted
inserted
replaced
| 9058:7c9368905639 | 9059:3c5920f57063 |
|---|---|
| 1267 avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; | 1267 avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; |
| 1268 avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; | 1268 avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; |
| 1269 //MPEG-1 aspect | 1269 //MPEG-1 aspect |
| 1270 avctx->sample_aspect_ratio= av_d2q( | 1270 avctx->sample_aspect_ratio= av_d2q( |
| 1271 1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255); | 1271 1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255); |
| 1272 | 1272 avctx->ticks_per_frame=1; |
| 1273 }else{//MPEG-2 | 1273 }else{//MPEG-2 |
| 1274 //MPEG-2 fps | 1274 //MPEG-2 fps |
| 1275 av_reduce( | 1275 av_reduce( |
| 1276 &s->avctx->time_base.den, | 1276 &s->avctx->time_base.den, |
| 1277 &s->avctx->time_base.num, | 1277 &s->avctx->time_base.num, |
| 1278 ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, | 1278 ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, |
| 1279 ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, | 1279 ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, |
| 1280 1<<30); | 1280 1<<30); |
| 1281 avctx->ticks_per_frame=2; | |
| 1281 //MPEG-2 aspect | 1282 //MPEG-2 aspect |
| 1282 if(s->aspect_ratio_info > 1){ | 1283 if(s->aspect_ratio_info > 1){ |
| 1283 //we ignore the spec here as reality does not match the spec, see for example | 1284 //we ignore the spec here as reality does not match the spec, see for example |
| 1284 // res_change_ffmpeg_aspect.ts and sequence-display-aspect.mpg | 1285 // res_change_ffmpeg_aspect.ts and sequence-display-aspect.mpg |
| 1285 if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) || 1){ | 1286 if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) || 1){ |