diff options
| author | Reinhard Nißl <rnissl@gmx.de> | 2009-03-28 20:44:44 +0100 |
|---|---|---|
| committer | Reinhard Nißl <rnissl@gmx.de> | 2009-03-28 20:44:44 +0100 |
| commit | 7a61cfaeba686449903c7fb6bcac28227509b71a (patch) | |
| tree | e194fafe5ffc2d1ae5e5d57841493ac4d7b58608 | |
| parent | cc330f2e604bacd33d1d3900fb6bc4301147c0a4 (diff) | |
| download | xine-lib-7a61cfaeba686449903c7fb6bcac28227509b71a.tar.gz xine-lib-7a61cfaeba686449903c7fb6bcac28227509b71a.tar.bz2 | |
Fix calculation of frame duration for ffmpeg-decoded formats.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -7,6 +7,7 @@ xine-lib (1.1.17) 2009-??-?? pause/resume freeze with pulseaudio). * Fix build with libavutil >= 50.0.0. * Fix segfaults when playing VCDs. + * Fix calculation of frame duration for ffmpeg-decoded formats. xine-lib (1.1.16.2) 2009-02-10 * Build fixes related to ImageMagick 6.4 & later. diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index adeef2c82..88a10504b 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1279,7 +1279,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { } /* use externally provided video_step or fall back to stream's time_base otherwise */ - video_step_to_use = (this->video_step || !this->context->time_base.den) ? this->video_step : (int)(90000ll * this->context->time_base.num / this->context->time_base.den); + video_step_to_use = (this->video_step || !this->context->time_base.den) ? this->video_step : (int)(90000ll * this->context->ticks_per_frame * this->context->time_base.num / this->context->time_base.den); /* aspect ratio provided by ffmpeg, override previous setting */ if ((this->aspect_ratio_prio < 2) && |