ffmpeg | branch: release/1.2 | Michael Niedermayer <michae...@gmx.at> | Sun Feb
1 19:19:25 2015 +0100| [9939d98b2c25048f5108997212ce0233c2aec40b] | committer:
Michael Niedermayer
avformat/utils: Fix number suffixes in tb_unreliable()
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 4b15bba2aec93776bfdc69a1bca42a4795a7d191)
Conflicts:
libavformat/utils.c
(cherry picked from commit e651a2f88c219e74c9851563e74100f7652a6005)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9939d98b2c25048f5108997212ce0233c2aec40b
---
libavformat/utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9dd403f..3758355 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2675,8 +2675,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_tag == AV_RL32("mp4v")
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
