sampoder · sampoder · Jan 1, 2020 · Dec 9, 2019 · Dec 9, 2019 · Dec 10, 2019
diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT
@@ -1,9 +1,22 @@
 0.89 (TBD)
+-----------------
 - New: Added support to output captions to MCC file (#733).
+- New: Added a few comments.
+- New: Added more fatals on no arguments errors.
+- New: Updated ccextractor.cnf.sample.
 - Fix: ccx_demuxer_mxf.c: Parse framerate from MXF captions to fix caption timings.
 - Fix: hardsubx_decoder.c: Fix memory leaks using Leptonica API.
 - Fix: linux/Makefile.am: added some sources to enable rpms to be created.
 - Fix: Crash when using -sc (sentence case) option (#1115)
+- Fix: Correct if-clauses (missing or misplaced brackets).
+- Fix: Comment out some unused code.
+- Fix: Resolve bunch of compilation's warnings.
+- Fix: Segmentation fault on VOB #1128
+- Fix: Hang while processing video #1121
+- Fix: Removed redundant check_configuration_file function
+- Fix: lib_ccx.c: Initialize fatal error logging function before first usage in init_libraries
+- Fix: Added italics, underline, and color rendering support for -out=spupng with EIA608/teletext
+- Fix: Change inet_ntop to inet_ntoa for Windows XP compatibility
 
 0.88 (2019-05-21)
 -----------------

diff --git a/docs/COMPILATION.MD b/docs/COMPILATION.MD
@@ -32,7 +32,7 @@ yum install -y glew-devel glfw-devel cmake gcc libcurl-devel tesseract-devel lep
 
 2. Compiling
 
-**Using the build script**
+### Using the build script
 
 
 ```bash
@@ -45,7 +45,7 @@ cd ccextractor/linux
 ./ccextractor
 ```
 
-**Standard linux compilation through Autoconf scripts**
+### Standard linux compilation through Autoconf scripts
 
 ```bash
 sudo apt-get install autoconf      #Dependency to generate configuration script
@@ -61,7 +61,7 @@ make
 sudo make install
 ```
 
-**Using CMake**
+### Using CMake
 
 ```bash
 #Create and navigate to directory where you want to store built files
@@ -82,8 +82,9 @@ make
 sudo make install
 ```
 
+`cmake` also accepts the argument `-DWITH_OCR=ON` to enable OCR.
 
-**Compiling with GUI:**
+### Compiling with GUI:
 
 To build CCExtractor with a gui you will additionally need to install [GLEW](http://glew.sourceforge.net/build.html) and [GLFW](http://www.glfw.org/docs/latest/compile.html)
 
@@ -118,9 +119,9 @@ pkg-config --exists --print-errors tesseract
 pkg-config --exists --print-errors lept
 ```
 
-2. Compiling
+### Compiling
 
-**Using build.command script:**
+#### Using build.command script:
 
 ```bash
 cd ccextractor/mac
@@ -140,7 +141,7 @@ cd ccextractor/mac
 ./ccextractor
 ```
 
-**Using CMake**
+#### Using CMake
 
 ```bash
 #Create and navigate to directory where you want to store built files
@@ -158,7 +159,7 @@ make
 ./ccextractor
 ```
 
-**Standard compilation through Autoconf scripts :**
+#### Standard compilation through Autoconf scripts:
 
 ```bash
 cd ccextractor/mac
@@ -170,7 +171,7 @@ make
 ./ccextractor
 ```
 
-**Compiling with GUI:**
+#### Compiling with GUI:
 
 To use CCExtractor with a gui you will additionally need to install GLEW and GLFW. You can do that by installing it via homebrew using:
 
@@ -219,7 +220,7 @@ Configurations options are: `(Debug|Release)-Full`
 
 Configurations options include dependent libraries which are used for OCR.
 
-**Using CMake**
+### Using CMake
 
 You may also generate `.sln` files for Visual Studio and build using build tools, or open `.sln` files using Visual Studio.
 

diff --git a/docs/ccextractor.cnf.sample b/docs/ccextractor.cnf.sample
@@ -1,5 +1,5 @@
 #######################################################
-# Version 0.01
+# Version 0.02
 #
 # To enable required option please uncomment option
 #
@@ -12,12 +12,15 @@
 # 0 = file
 # 1 = stdin
 # 2 = network
+# 3 = tcp
 
 INPUT_SOURCE=0
 
 # The Buffer Input tag
 # This tag takes number in its input.
 
+# Is it ccx_bufferdata_type ?
+
 #BUFFER_INPUT=0
 
 # The Direct Rollup tag
@@ -45,38 +48,50 @@ INPUT_SOURCE=0
 #NOTYPE_SETTING=
 
 # The Codec Tag takes the preference of codec
-# tag CCX_CODEC_ANY is by default
+# tag CCX_CODEC_ANY by default
 # This tag takes number in its input and their meanings
 # are following
-# 0 = CCX_CODEC_ANY
+# 0 = CCX_CODEC_ANY (default)
 # 1 = CCX_CODEC_TELETEXT
 # 2 = CCX_CODEC_DVB
+# 3 = CCX_CODEC_ISDB_CC
+# 4 = CCX_CODEC_ATSC_CC
+# 5 = CCX_CODEC_NONE
 
 #CODEC=
 
-# The NO Codec Tag do not use codec specified
-# tag CCX_CODEC_NONE is by default
+# The NO Codec Tag uses codec specified
+# tag CCX_CODEC_NONE by default
 # This tag takes number in its input and their meanings
 # are following
+# 0 = CCX_CODEC_ANY
 # 1 = CCX_CODEC_TELETEXT
 # 2 = CCX_CODEC_DVB
-# 3 = CCX_CODEC_NONE
+# 3 = CCX_CODEC_ISDB_CC
+# 4 = CCX_CODEC_ATSC_CC
+# 5 = CCX_CODEC_NONE (default)
 
 #NOCODEC=
 
 # OUTPUT_FORMAT tag specify format of output
 # by default output format is srt
 # This tag takes number in its input and their meanings
 # are following
-# 0 = CCX_OF_RAW
-# 1 = CCX_OF_SRT (default)
-# 2 = CCX_OF_SAMI
-# 3 = CCX_OF_TRANSCRIPT
-# 4 = CCX_OF_RCWT
-# 5 = CCX_OF_NULL
-# 6 = CCX_OF_SMPTETT
-# 7 = CCX_OF_SPUPNG
-# 8 = CCX_OF_DVDRAW
+# 0  = CCX_OF_RAW
+# 1  = CCX_OF_SRT (default)
+# 2  = CCX_OF_SAMI
+# 3  = CCX_OF_TRANSCRIPT
+# 4  = CCX_OF_RCWT
+# 5  = CCX_OF_NULL
+# 6  = CCX_OF_SMPTETT
+# 7  = CCX_OF_SPUPNG
+# 8  = CCX_OF_DVDRAW
+# 9	 = CCX_OF_WEBVTT
+# 10 = CCX_OF_SIMPLE_XML
+# 11 = CCX_OF_G608
+# 12 = CCX_OF_CURL
+# 13 = CCX_OF_SSA
+# 14 = CCX_OF_MCC
 
 #OUTPUT_FORMAT=
 

diff --git a/linux/autogen.sh b/linux/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ./pre-build.sh
 autoreconf -i
diff --git a/linux/build b/linux/build
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP"
 bit_os=$(getconf LONG_BIT)
 if [ "$bit_os"=="64" ]

diff --git a/linux/build-static.sh b/linux/build-static.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/usr/bin/env sh -ex
 
 ####################################################################
 # setup by tracey apr 2012

diff --git a/linux/build_hardsubx b/linux/build_hardsubx
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DENABLE_HARDSUBX -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP"
 bit_os=$(getconf LONG_BIT)
 if [ "$bit_os"=="64" ]

diff --git a/linux/builddebug b/linux/builddebug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP"
 bit_os=$(getconf LONG_BIT)
 if [ "$bit_os"=="64" ]

diff --git a/linux/cleanup b/linux/cleanup
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 make distclean > /dev/null 2>&1 || true
 rm -rf Makefile configure *.in config.status config.log aclocal.m4 build-conf autom4te.cache
diff --git a/linux/module_generator b/linux/module_generator
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')"
 SRC_ZLIB="$(find ../src/zlib/ -name '*.c')"
 SRC_ZVBI="$(find ../src/zvbi/ -name '*.c')"

diff --git a/linux/pre-build.sh b/linux/pre-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "Obtaining Git commit"
 commit=(`git rev-parse HEAD 2>/dev/null`)
 if [ -z "$commit" ]; then