Mercurial > mplayer.hg
diff edl.c @ 29263:0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
author | diego |
---|---|
date | Wed, 13 May 2009 02:58:57 +0000 |
parents | 64a5e75bb7f2 |
children | c1a3f1bbba26 |
line wrap: on
line diff
--- a/edl.c Tue May 12 19:25:35 2009 +0000 +++ b/edl.c Wed May 13 02:58:57 2009 +0000 @@ -22,12 +22,12 @@ mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_EdlOutOfMem); exit(1); } - + if (next_edl_record) // if this isn't the first record, tell the previous one what the new one is. next_edl_record->next = new_record; new_record->prev = next_edl_record; new_record->next = NULL; - + return new_record; } @@ -81,14 +81,14 @@ mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadlyFormattedLine, lineCount); continue; - } - + } + if (next_edl_record && start <= next_edl_record->stop_sec) { mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlNOValidLine, line); mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadLineOverlap, next_edl_record->stop_sec, start); - continue; + continue; } if (stop <= start) @@ -110,9 +110,9 @@ next_edl_record->length_sec = 0; next_edl_record->start_sec = start; next_edl_record->stop_sec = start; - + next_edl_record = edl_alloc_new(next_edl_record); - + next_edl_record->action = action; next_edl_record->length_sec = 0; next_edl_record->start_sec = stop; @@ -128,11 +128,11 @@ } fclose(fd); - } + } - if (edl_records) + if (edl_records) mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlRecordsNo, record_count); - else + else mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlQueueEmpty); return edl_records;