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 branch 'pr/n155_kisselef'

Browse Source
This commit is contained in:
cfsmp3 2015-05-04 13:40:49 +02:00
commit 53da058fe1
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_ccx/dvb_subtitle_decoder.c
View File

@ -1551,7 +1551,7 @@ int dvbsub_decode(void *dvb_ctx, const unsigned char *buf, int buf_size, struct
if (buf_size <= 6 || *buf != 0x0f)
{
mprint("incomplete or broken packet\n");
mprint("dvbsub_decode: incomplete, broken or empty packet\n");
return -1;
}
@ -1570,7 +1570,7 @@ int dvbsub_decode(void *dvb_ctx, const unsigned char *buf, int buf_size, struct
if (p_end - p < segment_length)
{
mprint("incomplete or broken packet\n");
mprint("dvbsub_decode: incomplete, broken or empty packet\n");
return -1;
}

14
src/lib_ccx/stream_functions.c
View File

@ -257,9 +257,17 @@ int read_video_pes_header (struct lib_ccx_ctx *ctx, unsigned char *nextheader, i
}
else
{
// We need at least 9 bytes to continue
if( sbuflen < 9 )
return -1;
if (ccx_bufferdatatype == CCX_DVB_SUBTITLE
&& peslen == 1 && nextheader[6] == 0xFF)
{
*headerlength = sbuflen;
return 0;
}
if (sbuflen < 9) // We need at least 9 bytes to continue
{
return -1;
}
}
*headerlength = 6+3;

13
src/lib_ccx/ts_functions.c
View File

@ -619,9 +619,18 @@ LLONG ts_getmoredata(struct lib_ccx_ctx *ctx)
int pesheaderlen;
int vpesdatalen = read_video_pes_header(ctx, ctx->capbuf, &pesheaderlen, ctx->capbuflen);
if (ccx_bufferdatatype == CCX_DVB_SUBTITLE && !vpesdatalen)
{
dbg_print(CCX_DMT_VERBOSE, "TS payload is a DVB Subtitle\n");
payload_read = ctx->capbuflen;
inbuf += payload_read;
break;
}
if (vpesdatalen < 0)
{ // Seems to be a broken PES
end_of_file=1;
{
dbg_print(CCX_DMT_VERBOSE, "Seems to be a broken PES. Terminating file handling.\n");
end_of_file = 1;
break;
}