Commit 29fc8f50 authored by Tomas Härdin's avatar Tomas Härdin Committed by Diego Biurrun

mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()

Only the OPAtom demuxing logic is guaranteed to have index tables,
meaning OP1a files that lack an index would cause SIGSEGV.
Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent a3923482
......@@ -1764,6 +1764,11 @@ static void mxf_packet_timestamps(MXFContext *mxf, AVPacket *pkt)
int64_t next_ofs;
MXFIndexTable *t = &mxf->index_tables[0];
/* this is called from the OP1a demuxing logic, which means there
* may be no index tables */
if (mxf->nb_index_tables <= 0)
return;
/* find mxf->current_edit_unit so that the next edit unit starts ahead of pkt->pos */
for (;;) {
if (mxf_edit_unit_absolute_offset(mxf, t, mxf->current_edit_unit + 1, NULL, &next_ofs, 0) < 0)
......@@ -1845,6 +1850,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
return mxf_read_packet_old(s, pkt);
/* OPAtom - clip wrapped demuxing */
/* NOTE: mxf_read_header() makes sure nb_index_tables > 0 for OPAtom */
st = s->streams[0];
t = &mxf->index_tables[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment