From 71768c38dc6727f46d6facf29284c5ec2e711eae Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sun, 27 Nov 2005 18:38:51 +0000 Subject: [PATCH] * modules/codec/ffmpeg/video.c: use frame-rate from container, if available (Closes:#428). --- modules/codec/ffmpeg/video.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c index ac082a97c5..ee3dc7d8c9 100644 --- a/modules/codec/ffmpeg/video.c +++ b/modules/codec/ffmpeg/video.c @@ -187,6 +187,15 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, } } + if( p_dec->fmt_out.video.i_frame_rate > 0 && + p_dec->fmt_out.video.i_frame_rate_base > 0 ) + { + p_dec->fmt_out.video.i_frame_rate = + p_dec->fmt_in.video.i_frame_rate; + p_dec->fmt_out.video.i_frame_rate_base = + p_dec->fmt_out.video.i_frame_rate_base; + } + else #if LIBAVCODEC_BUILD >= 4754 if( p_context->time_base.num > 0 && p_context->time_base.den > 0 ) { -- GitLab