From 590a5be411e38b8d772511dd87590ce12bad1754 Mon Sep 17 00:00:00 2001 From: "yuzhuohuang@qq.com" Date: Fri, 20 Apr 2012 22:14:02 +0800 Subject: [PATCH] fix "Multiple instances of simple fade" issue. --- src/filters/transform/vsfilter/VSFilter.rc | 8 ++++---- src/subtitles/RTS.cpp | 4 ---- test/issue.txt | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/filters/transform/vsfilter/VSFilter.rc b/src/filters/transform/vsfilter/VSFilter.rc index 5ce8ef0..9244bab 100644 --- a/src/filters/transform/vsfilter/VSFilter.rc +++ b/src/filters/transform/vsfilter/VSFilter.rc @@ -69,8 +69,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,0,0,5 - PRODUCTVERSION 3,0,0,5 + FILEVERSION 3,0,0,6 + PRODUCTVERSION 3,0,0,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -88,12 +88,12 @@ BEGIN VALUE "Comments", "http://code.google.com/p/xy-vsfilter/" VALUE "CompanyName", "xy-VSFilter Team" VALUE "FileDescription", "VobSub & TextSub filter for DirectShow/VirtualDub/Avisynth" - VALUE "FileVersion", "3, 0, 0, 5" + VALUE "FileVersion", "3, 0, 0, 6" VALUE "InternalName", "VSFilter" VALUE "LegalCopyright", "Copyright (C) 2001-2012 Yu Zhuohuang, Gabest et. al." VALUE "OriginalFilename", "VSFilter.dll" VALUE "ProductName", "VSFilter" - VALUE "ProductVersion", "3, 0, 0, 5" + VALUE "ProductVersion", "3, 0, 0, 6" END END BLOCK "VarFileInfo" diff --git a/src/subtitles/RTS.cpp b/src/subtitles/RTS.cpp index f516519..0ad9816 100644 --- a/src/subtitles/RTS.cpp +++ b/src/subtitles/RTS.cpp @@ -2403,10 +2403,6 @@ bool CRenderedTextSubtitle::ParseSSATag( CSubtitle* sub, const AssTagList& assTa sub->m_effects[EF_FADE] = e; } } - else - { - sub->m_fAnimated2 = false; - } break; } case CMD_fax: diff --git a/test/issue.txt b/test/issue.txt index b426c96..4bcc2f5 100644 --- a/test/issue.txt +++ b/test/issue.txt @@ -75,4 +75,4 @@ issue 31: \iclip animation fails. Associated script: 28.ass.(fixed) ============================================================== issue 32: Vector drawing fails if used alone inside text. Associated script: 29.ass.(Introduced in Commit:1fe0ea63406157ecf68e27323f5f7e651367b029)(fixed) ============================================================== -issue 33: Multiple instances of simple fade \fad(t1,t2) on one line break 3.0.0.2 animation detection. Associated script: 30.ass.(Introduced in Commit:139b6d9ae7b0ab49bb66281864116251c57d70cc) \ No newline at end of file +issue 33: Multiple instances of simple fade \fad(t1,t2) on one line break 3.0.0.2 animation detection. Associated script: 30.ass.(Introduced in Commit:139b6d9ae7b0ab49bb66281864116251c57d70cc)(fixed) \ No newline at end of file -- 2.11.4.GIT