Download-Tools/ccextractor
1
0
Fork 0
mirror of https://github.com/CCExtractor/ccextractor.git synced 2024-12-24 11:53:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fix

Browse Source 
Fixing errors that popped up after trying to merge.
This commit is contained in:
wforums 2014-08-12 12:14:36 +02:00
parent afaa7c8b76
commit 48e030d94c
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ccx_common_constants.h
View File

@ -1,6 +1,8 @@
#ifndef CCX_CONSTANTS_H
#define CCX_CONSTANTS_H
#include "stdio.h"
#ifndef __cplusplus
#define false 0
#define true 1

22
src/ccx_decoders_structs.h
View File

@ -2,6 +2,19 @@
#include "ccx_common_platform.h"
/* flag raised when end of display marker arrives in Dvb Subtitle */
#define SUB_EOD_MARKER (1 << 0 )
struct cc_bitmap
{
int x;
int y;
int w;
int h;
int nb_colors;
unsigned char *data[2];
int linesize[2];
};
/**
* Raw Subtitle struct used as output of decoder (cc608)
* and input for encoder (sami, srt, transcript or smptett etc)
@ -16,6 +29,15 @@ struct cc_subtitle
void *data;
/** number of data */
unsigned int nb_data;
/** type of subtitle */
enum subtype type;
/* set only when all the data is to be displayed at same time */
LLONG start_time;
LLONG end_time;
/* flags */
int flags;
/* index of language table */
int lang_index;
/** flag to tell that decoder has given output */
int got_output;
};

2
src/dvb_subtitle_decoder.c
View File

@ -24,7 +24,7 @@
#include "dvb_subtitle_decoder.h"
#include "utility.h"
#include "cc_decoders_common.h"
#include "ccx_decoders_common.h"
#define DVBSUB_PAGE_SEGMENT 0x10
#define DVBSUB_REGION_SEGMENT 0x11

2
src/spupng_encoder.c
View File

@ -2,7 +2,7 @@
#include "ccx_common_platform.h"
#include "spupng_encoder.h"
#include <assert.h>
#include "cc_encoders_common.h"
#include "ccx_encoders_common.h"
#include "utility.h"
#ifdef ENABLE_OCR
#include "ocr.h"