virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/sccdec: unbreak previous commits to this file

Browse Source
This commit is contained in:
Paul B Mahol
2020-06-14 21:16:57 +02:00
parent 76ad8a568f
commit 6c84f8afae
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/sccdec.c
View File

@@ -131,14 +131,11 @@ try_again:
o2 = convert(c4) | (convert(c3) << 4); o2 = convert(c4) | (convert(c3) << 4);
lline = NULL; lline = NULL;
out[i+0] = 0xfc;
out[i+1] = o1;
out[i+2] = o2;
if (o1 == 0x94 && o2 == 0x2f && saveptr && av_strcasecmp(saveptr, "942f")) { if (i > 12 && o1 == 0x94 && o2 == 0x20 && saveptr &&
(av_strncasecmp(saveptr, "942f", 4) || !av_strncasecmp(saveptr, "942c", 4))) {
int64_t duration; int64_t duration;
i += 3;
out[i] = 0; out[i] = 0;
duration = i * 11; duration = i * 11;
@@ -146,13 +143,17 @@ try_again:
if (!sub) if (!sub)
goto fail; goto fail;
current_pos += i;
sub->pos = current_pos; sub->pos = current_pos;
current_pos += i;
sub->pts = ts_start; sub->pts = ts_start;
sub->duration = duration; sub->duration = duration;
ts_start += duration; ts_start += duration;
i = 0; i = 0;
} }
out[i+0] = 0xfc;
out[i+1] = o1;
out[i+2] = o2;
} }
out[i] = 0; out[i] = 0;