Download-Tools/ccextractor
1
0
Fork 0
mirror of https://github.com/CCExtractor/ccextractor.git synced 2024-12-23 19:31:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/n111_wforums'

Browse Source
This commit is contained in:
cfsmp3 2014-10-11 08:05:02 +02:00
commit cce4ec5e1a
7 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/build
View File

@ -1,2 +1,2 @@
#!/bin/bash
gcc -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -o ccextractor $(find ../src/ -name '*.cpp') $(find ../src/ -name '*.c') -lm -zmuldefs
gcc -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -o ccextractor $(find ../src/ -name '*.cpp') $(find ../src/ -name '*.c') -lm -zmuldefs

0
src/ccfont2.xbm → src/lib_ccx/ccfont2.xbm
View File

4
src/lib_ccx/ccx_encoders_common.c
View File

@ -161,8 +161,8 @@ void write_cc_line_as_transcript2(struct eia608_screen *data, struct encoder_ctx
}
else {
mstotime(get_fts() + context->subs_delay, &h2, &m2, &s2, &ms2);
time_t end_time_int = end_time / 1000;
int end_time_dec = end_time % 1000;
time_t end_time_int = (end_time + context->subs_delay) / 1000;
int end_time_dec = (end_time + context->subs_delay) % 1000;
struct tm *end_time_struct = gmtime(&end_time_int);
strftime(buf2, sizeof(buf2), "%Y%m%d%H%M%S", end_time_struct);
fdprintf(context->out->fh, "%s%c%03d|", buf2,ccx_options.millis_separator,end_time_dec);

3
src/lib_ccx/params.c
View File

@ -235,9 +235,6 @@ void set_output_format (const char *format)
ccx_options.transcript_settings.showEndTime = 1;
ccx_options.transcript_settings.showCC = 0;
ccx_options.transcript_settings.showMode = 1;
} else {
// Throw exception
fatal(EXIT_INCOMPATIBLE_PARAMETERS, "timedtranscript cannot be set after -UCLA is used!");
}
}
else if (strcmp (format,"report")==0)

2
windows/ccextractor.vcxproj
View File

@ -11,7 +11,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ccextractor.h" />
<ClInclude Include="..\src\gpacmp4\gpac\avparse.h" />
<ClInclude Include="..\src\gpacmp4\gpac\base_coding.h" />
<ClInclude Include="..\src\gpacmp4\gpac\bitstream.h" />
@ -59,6 +58,7 @@
<ClInclude Include="..\src\lib_ccx\ccx_encoders_structs.h" />
<ClInclude Include="..\src\lib_ccx\disable_warnings.h" />
<ClInclude Include="..\src\lib_ccx\dvb_subtitle_decoder.h" />
<ClInclude Include="..\src\lib_ccx\lib_ccx.h" />
<ClInclude Include="..\src\lib_ccx\spupng_encoder.h" />
<ClInclude Include="..\src\lib_ccx\teletext.h" />
<ClInclude Include="..\src\zlib\crc32.h" />

6
windows/ccextractor.vcxproj.filters
View File

@ -51,9 +51,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ccextractor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\gpacmp4\gpac\avparse.h">
<Filter>Header Files\gpacmp4</Filter>
</ClInclude>
@ -240,6 +237,9 @@
<ClInclude Include="..\src\lib_ccx\spupng_encoder.h">
<Filter>Header Files\ccx_encoders</Filter>
</ClInclude>
<ClInclude Include="..\src\lib_ccx\lib_ccx.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\ccextractor.c">

3
windows/ccextractor.vcxproj.user
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerCommandArguments>
</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>-in=bin -pn 1 -UCLA -12 -noru -out=ttxt -utf8 -unixts 0 -delay 1412456401000 "E:\Downloads\2014-10-04_2100_US_CNN_Newsroom.ccx.bin"</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>