diff options
author | Underground78 <underground78@users.sourceforge.net> | 2014-05-10 13:42:04 +0400 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2014-06-03 12:26:42 +0400 |
commit | 25d0b883db786d77dcf0283895749e09a12a60e3 (patch) | |
tree | 54657957d92e74d7cf411c5595dd897b7046b577 /decoder | |
parent | 0c8c08104c3e0d92529a01701260254704740241 (diff) |
DVD Subtitles: Really obey the DVD Composit event or the forced sub flag.
Diffstat (limited to 'decoder')
-rw-r--r-- | decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp b/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp index 1db43251..12bdb28e 100644 --- a/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp +++ b/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp @@ -115,7 +115,7 @@ STDMETHODIMP CLAVSubtitleProvider::RequestFrame(REFERENCE_TIME start, REFERENCE_ CAutoLock lock(this); for (auto it = m_SubFrames.begin(); it != m_SubFrames.end(); it++) { CLAVSubRect *pRect = *it; - if ((pRect->rtStart == AV_NOPTS_VALUE) || ((pRect->rtStop == AV_NOPTS_VALUE || pRect->rtStop > mid) && pRect->rtStart <= mid) + if (((pRect->rtStart == AV_NOPTS_VALUE) || ((pRect->rtStop == AV_NOPTS_VALUE || pRect->rtStop > mid) && pRect->rtStart <= mid)) && (m_bComposit || pRect->forced)) { if (m_pHLI && PTS2RT(m_pHLI->StartPTM) <= mid && PTS2RT(m_pHLI->EndPTM) >= mid) { |