Skip to content

V
vlc-2-2
Commit 71768c38 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/codec/ffmpeg/video.c: use frame-rate from container, if available (Closes:#428).

parent cb3ffd97
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
modules/codec/ffmpeg/video.c
View file @ 71768c38
...@@ -187,6 +187,15 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, ...@@ -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 LIBAVCODEC_BUILD >= 4754
if( p_context->time_base.num > 0 && p_context->time_base.den > 0 ) if( p_context->time_base.num > 0 && p_context->time_base.den > 0 )
{ {
......
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