Merge branch 'dev' into release

2 years ago · 67a05ccf28
parent 01bba53843
commit 67a05ccf28
1 changed files with 1 additions and 0 deletions
--- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java
+++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java
@ -533,6 +533,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl

    @Override
    public void onTimedText(IMediaPlayer mp, IjkTimedText text) {
+        mSubtitleView.setCues(SubtitleParser.parse(text.getText()));
    }

    @Override