Merge commit 'd9fb5bb35066dcf85aa00e25ca91987728b2e78d'

Conflicts:
	src/stream_functions.c
This commit is contained in:
Carlos Fernandez 2014-06-20 06:39:33 -07:00
commit d691d4fa4b
2 changed files with 2 additions and 0 deletions

View File

@ -330,6 +330,7 @@ void writercwtdata (const unsigned char *data);
void detect_stream_type (void);
int detect_myth( void );
int read_video_pes_header (unsigned char *header, int *headerlength, int sbuflen);
int read_pts_pes(unsigned char*header, int len);
// ts_functions.cpp
void init_ts( void );

View File

@ -1,4 +1,5 @@
#include "png.h"
#include "ccextractor.h"
#ifdef ENABLE_OCR
#include "platform.h"
#include "capi.h"