1 | Index: mythtv/libs/libmythtv/NuppelVideoPlayer.cpp |
---|
2 | =================================================================== |
---|
3 | --- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (revision 22866) |
---|
4 | +++ mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (working copy) |
---|
5 | @@ -1069,13 +1069,17 @@ |
---|
6 | |
---|
7 | m_scan_locked = (scan != kScan_Detect); |
---|
8 | |
---|
9 | - if (scan == m_scan) |
---|
10 | + if (scan == m_scan) { |
---|
11 | + bool interlaced = m_deint_possible && is_interlaced(scan); |
---|
12 | + videosync->SetFrameInterval(frame_interval, interlaced); |
---|
13 | return; |
---|
14 | + } |
---|
15 | |
---|
16 | bool interlaced = is_interlaced(scan); |
---|
17 | if (interlaced && !m_deint_possible) |
---|
18 | { |
---|
19 | m_scan = scan; |
---|
20 | + videosync->SetFrameInterval(frame_interval, false); |
---|
21 | return; |
---|
22 | } |
---|
23 | |
---|
24 | @@ -1109,11 +1113,8 @@ |
---|
25 | if (kScan_Progressive == scan) |
---|
26 | { |
---|
27 | m_double_process = false; |
---|
28 | - if (m_double_framerate) |
---|
29 | - { |
---|
30 | - m_double_framerate = false; |
---|
31 | - videosync->SetFrameInterval(frame_interval, false); |
---|
32 | - } |
---|
33 | + m_double_framerate = false; |
---|
34 | + videosync->SetFrameInterval(frame_interval, false); |
---|
35 | videoOutput->SetDeinterlacingEnabled(false); |
---|
36 | VERBOSE(VB_PLAYBACK, "Disabled deinterlacing"); |
---|
37 | } |
---|