diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-12-16 15:51:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-12-16 15:51:16 +0000 |
| commit | 780eb1c9b9bb4b583c273792378fd15b2c942010 (patch) | |
| tree | 263b5610b24983dccc0a7f3b1db4876da44dfd88 /libavformat | |
| parent | e84a0475257a230828160a327beb7e4b48f79359 (diff) | |
| download | ffmpeg-780eb1c9b9bb4b583c273792378fd15b2c942010.tar.gz | |
nan fps fix
Originally committed as revision 4744 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index adeebcb627..83887a5996 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2618,7 +2618,12 @@ void dump_format(AVFormatContext *ic, } av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g); if(st->codec->codec_type == CODEC_TYPE_VIDEO){ - av_log(NULL, AV_LOG_INFO, ", %5.2f fps", av_q2d(st->r_frame_rate)); + if(st->r_frame_rate.den && st->r_frame_rate.num) + av_log(NULL, AV_LOG_INFO, ", %5.2f fps(r)", av_q2d(st->r_frame_rate)); +/* else if(st->time_base.den && st->time_base.num) + av_log(NULL, AV_LOG_INFO, ", %5.2f fps(m)", 1/av_q2d(st->time_base));*/ + else + av_log(NULL, AV_LOG_INFO, ", %5.2f fps(c)", 1/av_q2d(st->codec->time_base)); } av_log(NULL, AV_LOG_INFO, ": %s\n", buf); } |