har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prefer container time_base for frame duration guess

Browse Source 
Originally committed as revision 4190 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-05-06 20:26:50 +00:00
parent b712fb6740
commit 327c4076a3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/utils.c
View File

@ -632,16 +632,16 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st,
*pden = 0; *pden = 0;
switch(st->codec.codec_type) { switch(st->codec.codec_type) {
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
if(st->codec.time_base.num*1000 <= st->codec.time_base.den){ if(st->time_base.num*1000 > st->time_base.den){
*pnum = st->time_base.num; *pnum = st->time_base.num;
*pden = st->time_base.den; *pden = st->time_base.den;
}else{ }else if(st->codec.time_base.num*1000 > st->codec.time_base.den){
*pnum = st->codec.time_base.num; *pnum = st->codec.time_base.num;
*pden = st->codec.time_base.den; *pden = st->codec.time_base.den;
} if (pc && pc->repeat_pict) {
if (pc && pc->repeat_pict) { *pden *= 2;
*pden *= 2; *pnum = (*pnum) * (2 + pc->repeat_pict);
*pnum = (*pnum) * (2 + pc->repeat_pict); }
} }
break; break;
case CODEC_TYPE_AUDIO: case CODEC_TYPE_AUDIO: