diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-01-08 02:15:00 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-01-08 02:16:22 +0400 |
| commit | 80bd16928bad832d1cdef8508bb8b7671723b612 (patch) | |
| tree | e942df3f63cd325ecfd53fcb84fa988461dba5be /decoder | |
| parent | 008a4d35815414fc118f489273e4301c761c8a25 (diff) | |
Don't treat forced subtitles as menu frames.
This fixes DVD forced subtitles staying too long on the screen (until the next line appears).
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp b/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp index 68e295be..381cf943 100644 --- a/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp +++ b/decoder/LAVVideo/subtitles/LAVSubtitleProvider.cpp @@ -298,8 +298,6 @@ STDMETHODIMP CLAVSubtitleProvider::Decode(BYTE *buf, int buflen, REFERENCE_TIME if (got_sub) { REFERENCE_TIME rtSubStart = rtStart, rtSubStop = AV_NOPTS_VALUE; - if (m_pAVCtx->codec_id == AV_CODEC_ID_DVD_SUBTITLE && sub.num_rects && sub.rects && sub.rects[0]->flags & AV_SUBTITLE_FLAG_FORCED) - rtSubStart = AV_NOPTS_VALUE; if (rtSubStart != AV_NOPTS_VALUE) { if (sub.end_display_time > 0) { rtSubStop = rtSubStart + (sub.end_display_time * 10000i64); @@ -321,10 +319,6 @@ void CLAVSubtitleProvider::ProcessSubtitleFrame(AVSubtitle *sub, REFERENCE_TIME { if (sub->num_rects > 0) { if (m_pAVCtx->codec_id == AV_CODEC_ID_DVD_SUBTITLE) { - if (rtStart == AV_NOPTS_VALUE && sub->rects[0]->flags & AV_SUBTITLE_FLAG_FORCED) { - ClearSubtitleRects(); - m_pLAVVideo->SetInDVDMenu(true); - } if (rtStart != AV_NOPTS_VALUE) { CAutoLock lock(this); for (auto it = m_SubFrames.begin(); it != m_SubFrames.end(); it++) { |