diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-01 19:19:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:49 +0100 |
| commit | c00fd60ab34506c2f4f5b6e704604f25962af129 (patch) | |
| tree | 327ab9a6b4a8d0374bad96560ce74c052304f6f7 | |
| parent | c78ed1fb5d3338634cdd79b1b8edf246a4ab7177 (diff) | |
| download | ffmpeg-c00fd60ab34506c2f4f5b6e704604f25962af129.tar.gz | |
avformat/utils: Fix number suffixes in tb_unreliable()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4b15bba2aec93776bfdc69a1bca42a4795a7d191)
Conflicts:
libavformat/utils.c
(cherry picked from commit e651a2f88c219e74c9851563e74100f7652a6005)
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 48fe249b14..836f0ec436 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2382,8 +2382,8 @@ static int get_std_framerate(int i){ * And there are "variable" fps files this needs to detect as well. */ static int tb_unreliable(AVCodecContext *c){ - if( c->time_base.den >= 101L*c->time_base.num - || c->time_base.den < 5L*c->time_base.num + if( c->time_base.den >= 101LL*c->time_base.num + || c->time_base.den < 5LL*c->time_base.num /* || c->codec_tag == AV_RL32("DIVX") || c->codec_tag == AV_RL32("XVID")*/ || c->codec_id == CODEC_ID_MPEG2VIDEO |