vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Nov 30 15:33:15 2016 +0100| [66a638cbe9bd8746aa1cac84a2a9317f3e5a5382] | committer: Francois Cartegnie
vfilter: fps: incorrect fps stored in picture fmt > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=66a638cbe9bd8746aa1cac84a2a9317f3e5a5382 --- modules/video_filter/fps.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/video_filter/fps.c b/modules/video_filter/fps.c index a992ebb..c4bc35e 100644 --- a/modules/video_filter/fps.c +++ b/modules/video_filter/fps.c @@ -80,6 +80,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_picture) return NULL; } + p_picture->format.i_frame_rate = p_filter->fmt_out.video.i_frame_rate; + p_picture->format.i_frame_rate_base = p_filter->fmt_out.video.i_frame_rate_base; + /* First time we get some valid timestamp, we'll take it as base for output later on we retake new timestamp if it has jumped too much */ if( unlikely( ( date_Get( &p_sys->next_output_pts ) == VLC_TS_INVALID ) || @@ -114,7 +117,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_picture) while( unlikely( (date_Get( &p_sys->next_output_pts ) + p_sys->i_output_frame_interval ) < p_picture->date ) ) { picture_t *p_tmp = NULL; - p_tmp = picture_NewFromFormat( &p_filter->fmt_in.video ); + p_tmp = picture_NewFromFormat( &p_filter->fmt_out.video ); picture_Copy( p_tmp, p_sys->p_previous_pic); p_tmp->date = date_Get( &p_sys->next_output_pts ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
