diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-08-08 03:10:05 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-08-08 19:01:35 -0300 |
commit | 6ad257b71223f2212fb92e80031cf687442ebdd2 (patch) | |
tree | 91a0c80aa76208f7ecbf62ee945732ba80373560 /libre/mplayer-vaapi/subreader-fix-srt-parsing.patch | |
parent | 59dfa90d18c5434a459240eebca33d6fa0487523 (diff) | |
download | abslibre-6ad257b71223f2212fb92e80031cf687442ebdd2.tar.gz abslibre-6ad257b71223f2212fb92e80031cf687442ebdd2.tar.bz2 abslibre-6ad257b71223f2212fb92e80031cf687442ebdd2.zip |
mplayer-vaapi-36265-14.parabola2: fix https://labs.parabola.nu/issues/776
* move to [pcr] because Arch removed it from [community]
* disable using of UnRAR executable
* remove native FFmpeg AAC encoder description because mplayer doesn't support it
Diffstat (limited to 'libre/mplayer-vaapi/subreader-fix-srt-parsing.patch')
-rw-r--r-- | libre/mplayer-vaapi/subreader-fix-srt-parsing.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/libre/mplayer-vaapi/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi/subreader-fix-srt-parsing.patch deleted file mode 100644 index f1c087377..000000000 --- a/libre/mplayer-vaapi/subreader-fix-srt-parsing.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: sub/subreader.c -=================================================================== ---- sub/subreader.c (revision 36284) -+++ sub/subreader.c (revision 36285) -@@ -378,14 +378,14 @@ - int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; - - while (!current->text[0]) { -- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; -+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; - int i; - - /* Parse SubRip header */ - if (!stream_read_line(st, line, LINE_LEN, utf16)) - return NULL; -- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", -- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", -+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) - continue; - - current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; -@@ -442,7 +442,7 @@ - #endif - while (!current->text[0]) { - if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; -- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - continue; - current->start = a1*360000+a2*6000+a3*100+a4/10; - current->end = b1*360000+b2*6000+b3*100+b4/10; -@@ -1123,7 +1123,7 @@ - {*uses_time=1;return SUB_MPL2;} - if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) - {*uses_time=1;return SUB_SUBRIP;} -- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) -+ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) - {*uses_time=1;return SUB_SUBVIEWER;} - if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) - {*uses_time=1;return SUB_SUBVIEWER2;} |