generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/utils: Fix number suffixes in tb_unreliable()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4b15bba2ae)

Conflicts:

	libavformat/utils.c
(cherry picked from commit e651a2f88c)
This commit is contained in:
Michael Niedermayer
2015-02-01 19:19:25 +01:00
parent de84d683b2
commit bbef5b0b86
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/utils.c
View File

@@ -2652,8 +2652,8 @@ static int get_std_framerate(int i){
* And there are "variable" fps files this needs to detect as well. * And there are "variable" fps files this needs to detect as well.
*/ */
static int tb_unreliable(AVCodecContext *c){ static int tb_unreliable(AVCodecContext *c){
if( c->time_base.den >= 101L*c->time_base.num if( c->time_base.den >= 101LL*c->time_base.num
|| c->time_base.den < 5L*c->time_base.num || c->time_base.den < 5LL*c->time_base.num
/* || c->codec_tag == AV_RL32("DIVX") /* || c->codec_tag == AV_RL32("DIVX")
|| c->codec_tag == AV_RL32("XVID")*/ || c->codec_tag == AV_RL32("XVID")*/
|| c->codec_tag == AV_RL32("mp4v") || c->codec_tag == AV_RL32("mp4v")