Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGES.TXT
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
1.0 (to be released)
-----------------
- Fix: Segmentation faults on MP4 files with CEA-708 captions
- Refactor: Remove API structures from ccextractor
- New: Add Encoder Module to Rust
- Fix: Elementary stream regressions
Expand Down
5 changes: 3 additions & 2 deletions src/lib_ccx/mp4.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,6 @@ static int process_clcp(struct lib_ccx_ctx *ctx, struct encoder_ctx *enc_ctx,
dbg_print(CCX_DMT_PARSE, "MP4-708: atom skipped (cc_type < 2)\n");
continue;
}
// WARN: otherwise cea-708 will not work
dec_ctx->dtvcc->encoder = (void *)enc_ctx;
dtvcc_process_data(dec_ctx->dtvcc, (unsigned char *)temp);
cb_708++;
}
Expand Down Expand Up @@ -552,6 +550,9 @@ int processmp4(struct lib_ccx_ctx *ctx, struct ccx_s_mp4Cfg *cfg, char *file)
if (enc_ctx)
enc_ctx->timing = dec_ctx->timing;

// WARN: otherwise cea-708 will not work
dec_ctx->dtvcc->encoder = (void *)enc_ctx;

memset(&dec_sub, 0, sizeof(dec_sub));
mprint("Opening \'%s\': ", file);
#ifdef MP4_DEBUG
Expand Down
4 changes: 2 additions & 2 deletions src/rust/lib_ccxr/src/encoder/txt_helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,10 @@ pub fn get_str_basic(
info!("WARNING: Encoding is not yet supported\n");
out_buffer.clear();
out_buffer.push(0);
return 0;
0
} else {
out_buffer.push(0);
return len;
len
}
}

Expand Down
Loading