diff --git a/src/ccextractor.c b/src/ccextractor.c index 3f9917f3..bce976ee 100644 --- a/src/ccextractor.c +++ b/src/ccextractor.c @@ -3,7 +3,7 @@ Credits: See CHANGES.TXT License: GPL 2.0 */ #include -#include "ccextractor.h" +#include "lib_ccx.h" #include "configuration.h" #include #include diff --git a/src/gpacmp4/mp4.c b/src/gpacmp4/mp4.c index 9f67bbf2..12b5aec7 100644 --- a/src/gpacmp4/mp4.c +++ b/src/gpacmp4/mp4.c @@ -3,7 +3,7 @@ #include #include -#include "ccextractor.h" +#include "lib_ccx.h" #include "utility.h" #include "ccx_encoders_common.h" diff --git a/src/lib_ccx/608_sami.c b/src/lib_ccx/608_sami.c index c4e2738a..82cf96d4 100644 --- a/src/lib_ccx/608_sami.c +++ b/src/lib_ccx/608_sami.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "ccx_encoders_common.h" #include "png.h" #include "spupng_encoder.h" diff --git a/src/lib_ccx/608_smptett.c b/src/lib_ccx/608_smptett.c index ddac71bd..9bb592aa 100644 --- a/src/lib_ccx/608_smptett.c +++ b/src/lib_ccx/608_smptett.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "ccx_encoders_common.h" #include "png.h" #include "spupng_encoder.h" diff --git a/src/lib_ccx/608_spupng.h b/src/lib_ccx/608_spupng.h index d54b6dd0..f3a2e0ff 100644 --- a/src/lib_ccx/608_spupng.h +++ b/src/lib_ccx/608_spupng.h @@ -1,6 +1,6 @@ #ifndef __608_SPUPNG_H__ -#include "ccextractor.h" +#include "lib_ccx.h" #include "spupng_encoder.h" #include "ccx_encoders_common.h" diff --git a/src/lib_ccx/608_srt.c b/src/lib_ccx/608_srt.c index 5d3d84b6..125f6d23 100644 --- a/src/lib_ccx/608_srt.c +++ b/src/lib_ccx/608_srt.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "ccx_encoders_common.h" #include "png.h" #include "spupng_encoder.h" diff --git a/src/lib_ccx/activity.c b/src/lib_ccx/activity.c index 003b08cc..b1db5acc 100644 --- a/src/lib_ccx/activity.c +++ b/src/lib_ccx/activity.c @@ -1,7 +1,7 @@ /* This file contains functions that report the user of the GUI of relevant events. */ -#include "ccextractor.h" +#include "lib_ccx.h" static int credits_shown=0; unsigned long net_activity_gui=0; diff --git a/src/lib_ccx/asf_functions.c b/src/lib_ccx/asf_functions.c index 2624f4e4..208a50cb 100644 --- a/src/lib_ccx/asf_functions.c +++ b/src/lib_ccx/asf_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "asf_constants.h" // Indicate first / subsequent calls to asf_getmoredata() diff --git a/src/lib_ccx/avc_functions.c b/src/lib_ccx/avc_functions.c index 0c392e6f..71856ea3 100644 --- a/src/lib_ccx/avc_functions.c +++ b/src/lib_ccx/avc_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include // Functions to parse a AVC/H.264 data stream, see ISO/IEC 14496-10 diff --git a/src/lib_ccx/cc_bitstream.c b/src/lib_ccx/cc_bitstream.c index b44fa379..5c8eb245 100644 --- a/src/lib_ccx/cc_bitstream.c +++ b/src/lib_ccx/cc_bitstream.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" // Hold functions to read streams on a bit or byte oriented basis // plus some data related helper functions. diff --git a/src/lib_ccx/ccx_encoders_common.c b/src/lib_ccx/ccx_encoders_common.c index 7276cdaf..2984df1d 100644 --- a/src/lib_ccx/ccx_encoders_common.c +++ b/src/lib_ccx/ccx_encoders_common.c @@ -1,4 +1,3 @@ -//#include "ccextractor.h" #include "ccx_decoders_common.h" #include "ccx_encoders_common.h" #include "spupng_encoder.h" diff --git a/src/lib_ccx/configuration.c b/src/lib_ccx/configuration.c index 8001d3a8..6957d27d 100644 --- a/src/lib_ccx/configuration.c +++ b/src/lib_ccx/configuration.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "configuration.h" #include #define CNF_FILE "ccextractor.cnf" diff --git a/src/lib_ccx/dvb_subtitle_decoder.h b/src/lib_ccx/dvb_subtitle_decoder.h index 71318cf4..2ab83d6d 100644 --- a/src/lib_ccx/dvb_subtitle_decoder.h +++ b/src/lib_ccx/dvb_subtitle_decoder.h @@ -18,7 +18,7 @@ #define MAX_LANGUAGE_PER_DESC 5 -#include "ccextractor.h" +#include "lib_ccx.h" #ifdef __cplusplus extern "C" { diff --git a/src/lib_ccx/es_functions.c b/src/lib_ccx/es_functions.c index 6727c944..11f2527c 100644 --- a/src/lib_ccx/es_functions.c +++ b/src/lib_ccx/es_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" // Functions to parse a mpeg-2 data stream, see ISO/IEC 13818-2 6.2 static int no_bitstream_error = 0; diff --git a/src/lib_ccx/es_userdata.c b/src/lib_ccx/es_userdata.c index 354f7c85..86a94bca 100644 --- a/src/lib_ccx/es_userdata.c +++ b/src/lib_ccx/es_userdata.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" // Parse the user data for captions. The udtype variable denotes diff --git a/src/lib_ccx/ffmpeg_intgr.c b/src/lib_ccx/ffmpeg_intgr.c index 193fc21e..6fe5b14f 100644 --- a/src/lib_ccx/ffmpeg_intgr.c +++ b/src/lib_ccx/ffmpeg_intgr.c @@ -13,7 +13,7 @@ #include #include -#include "ccextractor.h" +#include "lib_ccx.h" struct ffmpeg_ctx { AVFormatContext *ifmt; diff --git a/src/lib_ccx/file_functions.c b/src/lib_ccx/file_functions.c index 6f978639..713f358f 100644 --- a/src/lib_ccx/file_functions.c +++ b/src/lib_ccx/file_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" long FILEBUFFERSIZE = 1024*1024*16; // 16 Mbytes no less. Minimize number of real read calls() LLONG buffered_read_opt_file (unsigned char *buffer, unsigned int bytes); diff --git a/src/lib_ccx/general_loop.c b/src/lib_ccx/general_loop.c index 884b6105..380e241d 100644 --- a/src/lib_ccx/general_loop.c +++ b/src/lib_ccx/general_loop.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #ifdef _WIN32 #include #else diff --git a/src/lib_ccx/myth.c b/src/lib_ccx/myth.c index 38c7a046..5618e1f0 100644 --- a/src/lib_ccx/myth.c +++ b/src/lib_ccx/myth.c @@ -1,7 +1,7 @@ /* This code comes from MythTV. For now, integration with ccextractor is a quick hack. It could get better with time. */ -#include "ccextractor.h" +#include "lib_ccx.h" #include "ccx_decoders_608.h" #ifdef _WIN32 #include diff --git a/src/lib_ccx/networking.c b/src/lib_ccx/networking.c index c1dfd8c0..0aaffe72 100644 --- a/src/lib_ccx/networking.c +++ b/src/lib_ccx/networking.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "networking.h" #include diff --git a/src/lib_ccx/ocr.c b/src/lib_ccx/ocr.c index 06e88fe0..1c364abf 100644 --- a/src/lib_ccx/ocr.c +++ b/src/lib_ccx/ocr.c @@ -1,5 +1,5 @@ #include "png.h" -#include "ccextractor.h" +#include "lib_ccx.h" #ifdef ENABLE_OCR #include "platform.h" #include "capi.h" diff --git a/src/lib_ccx/output.c b/src/lib_ccx/output.c index ff724010..a19426c7 100644 --- a/src/lib_ccx/output.c +++ b/src/lib_ccx/output.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #ifdef _WIN32 #include #else diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c index e6382726..6c90e55b 100644 --- a/src/lib_ccx/params.c +++ b/src/lib_ccx/params.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "utility.h" static int inputfile_capacity=0; diff --git a/src/lib_ccx/params_dump.c b/src/lib_ccx/params_dump.c index dcccec2b..c60b30df 100644 --- a/src/lib_ccx/params_dump.c +++ b/src/lib_ccx/params_dump.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" void params_dump(void) { diff --git a/src/lib_ccx/sequencing.c b/src/lib_ccx/sequencing.c index 9dd7e0d1..b576da3f 100644 --- a/src/lib_ccx/sequencing.c +++ b/src/lib_ccx/sequencing.c @@ -1,10 +1,10 @@ -#include "ccextractor.h" +#include "lib_ccx.h" // Defined by the maximum number of B-Frames per anchor frame. -//#define MAXBFRAMES 50 - from ccextractor.h +//#define MAXBFRAMES 50 - from lib_ccx.h // They can be (temporally) before or after the anchor. Reserve // enough space. -//#define SORTBUF (2*MAXBFRAMES+1) - from ccextractor.h +//#define SORTBUF (2*MAXBFRAMES+1) - from lib_ccx.h // B-Frames can be (temporally) before or after the anchor int cc_data_count[SORTBUF]; // Store fts; diff --git a/src/lib_ccx/stream_functions.c b/src/lib_ccx/stream_functions.c index 5aeebabf..8c17059f 100644 --- a/src/lib_ccx/stream_functions.c +++ b/src/lib_ccx/stream_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #ifdef _WIN32 #include #else diff --git a/src/lib_ccx/telxcc.c b/src/lib_ccx/telxcc.c index 074cc742..10df1653 100644 --- a/src/lib_ccx/telxcc.c +++ b/src/lib_ccx/telxcc.c @@ -28,7 +28,7 @@ Werner Brückner -- Teletext in digital television */ -#include "ccextractor.h" +#include "lib_ccx.h" #include "hamming.h" #include "teletext.h" #include diff --git a/src/lib_ccx/ts_functions.c b/src/lib_ccx/ts_functions.c index ced1e036..8b9a2a55 100644 --- a/src/lib_ccx/ts_functions.c +++ b/src/lib_ccx/ts_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" unsigned char tspacket[188]; // Current packet diff --git a/src/lib_ccx/ts_tables.c b/src/lib_ccx/ts_tables.c index 71a834f8..e3eee85f 100644 --- a/src/lib_ccx/ts_tables.c +++ b/src/lib_ccx/ts_tables.c @@ -5,7 +5,7 @@ PMT specs: ISO13818-1 / table 2-28 */ -#include "ccextractor.h" +#include "lib_ccx.h" #include "dvb_subtitle_decoder.h" #include "utility.h" static unsigned pmt_warning_shown=0; // Only display warning once diff --git a/src/lib_ccx/utility.c b/src/lib_ccx/utility.c index da64f169..be8acb55 100644 --- a/src/lib_ccx/utility.c +++ b/src/lib_ccx/utility.c @@ -1,5 +1,5 @@ #include -#include "ccextractor.h" +#include "lib_ccx.h" static char *text; static int text_size=0; diff --git a/src/lib_ccx/wtv_functions.c b/src/lib_ccx/wtv_functions.c index 56f2c7b7..0fd40fb1 100644 --- a/src/lib_ccx/wtv_functions.c +++ b/src/lib_ccx/wtv_functions.c @@ -1,4 +1,4 @@ -#include "ccextractor.h" +#include "lib_ccx.h" #include "wtv_constants.h" int check_stream_id(int stream_id, int video_streams[], int num_streams);