github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-15 16:01:15 +02:00
Code Releases Activity

sub_cc.c: minor cleanup

Browse Source 
Avoid unnecessary ().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32599 b3059339-0415-0410-9bf9-f77b7e298cf2

Use calloc instead of malloc+memset.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32600 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-11-07 18:13:22 +00:00 committed by Uoti Urpala
parent fdea095e34
commit cbb7ef057c
1 changed files with 5 additions and 6 deletions

11
sub_cc.c

@ -100,7 +100,7 @@ static void scroll_buffer(subtitle* buf)
{ {
free(buf->text[0]); free(buf->text[0]);
for(i = 0; i < (buf->lines - 1); i++) buf->text[i] = buf->text[i+1]; for(i = 0; i < buf->lines - 1; i++) buf->text[i] = buf->text[i+1];
buf->text[buf->lines-1] = NULL; buf->text[buf->lines-1] = NULL;
buf->lines--; buf->lines--;
@ -134,8 +134,7 @@ static void append_char(char c)
if(!bb->lines) {bb->lines++; cursor_pos=0;} if(!bb->lines) {bb->lines++; cursor_pos=0;}
if(bb->text[bb->lines - 1]==NULL) if(bb->text[bb->lines - 1]==NULL)
{ {
bb->text[bb->lines - 1]=malloc(CC_MAX_LINE_LENGTH); bb->text[bb->lines - 1] = calloc(1, CC_MAX_LINE_LENGTH);
memset(bb->text[bb->lines - 1],0,CC_MAX_LINE_LENGTH);
cursor_pos=0; cursor_pos=0;
} }
@ -286,7 +285,7 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength)
while (curbytes < inputlength) { while (curbytes < inputlength) {
int skip = 2; int skip = 2;
cc_code = *(current); cc_code = current[0];
if (inputlength - curbytes < 2) { if (inputlength - curbytes < 2) {
#ifdef LOG_DEBUG #ifdef LOG_DEBUG
@ -295,8 +294,8 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength)
break; break;
} }
data1 = *(current+1); data1 = current[1];
data2 = *(current + 2); data2 = current[2];
current++; curbytes++; current++; curbytes++;
switch (cc_code) { switch (cc_code) {