Skip to content

V
vlc
Commit 675c29fa authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Avformat: correctly detect the fps 

Manual backport of c1cf203b
parent 8a659b0b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/demux/avformat/demux.c
View file @ 675c29fa
...@@ -286,7 +286,11 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -286,7 +286,11 @@ int OpenDemux( vlc_object_t *p_this )
} }
psz_type = "video"; psz_type = "video";
fmt.video.i_frame_rate = cc->time_base.den; fmt.video.i_frame_rate = cc->time_base.den;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,20,0)
fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 );
#else
fmt.video.i_frame_rate_base = cc->time_base.num; fmt.video.i_frame_rate_base = cc->time_base.num;
#endif
break; break;
case CODEC_TYPE_SUBTITLE: case CODEC_TYPE_SUBTITLE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment