From 7f589ecade2acc3d0400a3303bab8e0146a2b4d1 Mon Sep 17 00:00:00 2001 From: Hugh Mackworth Date: Tue, 11 Oct 2016 11:23:31 -0700 Subject: [PATCH 1/3] Fix Mac build process --- mac/build.command | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mac/build.command b/mac/build.command index 99abc2027..6337e7ade 100755 --- a/mac/build.command +++ b/mac/build.command @@ -1,17 +1,17 @@ #!/bin/bash cd `dirname $0` -BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek" -BLD_INCLUDE="-I../src/lib_ccx -I../src/gpacmp4 -I../src/libpng -I../src/zlib -I../src/zvbi -I../src/lib_hash" -SRC_LIBPNG="$(find ../src/libpng -name '*.c')" -SRC_ZLIB="$(find ../src/zlib -name '*.c')" -SRC_ZVBI="$(find ../src/zvbi -name '*.c')" +BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek" +BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/gpacmp4 -I../src/lib_hash -I../src/libpng -I../src/utf8proc -I../src/zlib -I../src/zvbi" SRC_CCX="$(find ../src/lib_ccx -name '*.c')" SRC_GPAC="$(find ../src/gpacmp4 -name '*.c')" SRC_LIB_HASH="$(find ../src/lib_hash -name '*.c')" -BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZVBI $SRC_ZLIB $SRC_LIBPNG $SRC_LIB_HASH" +SRC_LIBPNG="$(find ../src/libpng -name '*.c')" +SRC_PROTOBUF="$(find ../src/protobuf-c -name '*.c')" +SRC_UTF8="$(find ../src/utf8proc-c -name '*.c')" +SRC_ZLIB="$(find ../src/zlib -name '*.c')" +SRC_ZVBI="$(find ../src/zvbi -name '*.c')" +BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_LIB_HASH $SRC_LIBPNG $SRC_PROTOBUF $SRC_UTF8 $SRC_ZLIB $SRC_ZVBI" BLD_LINKER="-lm -liconv" ./pre-build.sh gcc $BLD_FLAGS $BLD_INCLUDE -o ccextractor $BLD_SOURCES $BLD_LINKER - - From 2ac200cdb2d4107a59de3b82cb764735324ff98f Mon Sep 17 00:00:00 2001 From: Hugh Mackworth Date: Tue, 11 Oct 2016 11:46:22 -0700 Subject: [PATCH 2/3] Fix Mac build process Remove unnecessary debug parameter --- mac/build.command | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mac/build.command b/mac/build.command index 6337e7ade..73ce22a1e 100755 --- a/mac/build.command +++ b/mac/build.command @@ -1,6 +1,6 @@ #!/bin/bash cd `dirname $0` -BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek" +BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek" BLD_INCLUDE="-I../src/ -I../src/lib_ccx -I../src/gpacmp4 -I../src/lib_hash -I../src/libpng -I../src/utf8proc -I../src/zlib -I../src/zvbi" SRC_CCX="$(find ../src/lib_ccx -name '*.c')" SRC_GPAC="$(find ../src/gpacmp4 -name '*.c')" From 2f4fb88e07e0520cd980f7f8bf0dae703e0bc5bb Mon Sep 17 00:00:00 2001 From: Hugh Mackworth Date: Tue, 11 Oct 2016 11:48:43 -0700 Subject: [PATCH 3/3] Fix --stream option with Stdin --- src/lib_ccx/params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c index 10c647384..fe1021c19 100644 --- a/src/lib_ccx/params.c +++ b/src/lib_ccx/params.c @@ -990,7 +990,7 @@ int parse_parameters (struct ccx_s_options *opt, int argc, char *argv[]) { opt->input_source=CCX_DS_STDIN; - opt->live_stream=-1; + if (!opt->live_stream) opt->live_stream=-1; continue; } if (argv[i][0]!='-')