From b174418db53559939cad7b8f9642c0b298849bcf Mon Sep 17 00:00:00 2001 From: Jim Stichnoth Date: Sat, 2 Mar 2013 13:12:40 -0800 Subject: [PATCH] Fixes #11432. Remove a now-unnecessary scaling operation. H264Parser::frameRate() was modified in 5ccedb61ddd2fa87b426cd1c0fbc43d2645cb9a55ccedb61ddd2fa87b426 to return frames per second instead of frames per thousand seconds, but the one remaining call to frameRate() was still trying to convert to frames per second. This caused big problems in the AVSync mechanism. --- mythtv/libs/libmythtv/avformatdecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp index a1551de4be9..cb5ccee4d01 100644 --- a/mythtv/libs/libmythtv/avformatdecoder.cpp +++ b/mythtv/libs/libmythtv/avformatdecoder.cpp @@ -3130,7 +3130,7 @@ int AvFormatDecoder::H264PreProcessPkt(AVStream *stream, AVPacket *pkt) uint height = m_h264_parser->pictureHeight(); if (height == 1088 && current_height == 1080) height = 1080; - float seqFPS = m_h264_parser->frameRate() * 0.001f; + float seqFPS = m_h264_parser->frameRate(); bool res_changed = ((width != (uint)current_width) || (height != (uint)current_height));