virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

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

Browse Source 
Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a
files that lack an index would cause SIGSEGV.
This commit is contained in:
Tomas Härdin 2011-12-20 11:22:23 +01:00
parent 54cbbdd25a
commit 1888bd1b6d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mxfdec.c
View File

@ -1714,6 +1714,10 @@ static void mxf_packet_timestamps(MXFContext *mxf, AVPacket *pkt)
int64_t next_ofs; int64_t next_ofs;
MXFIndexTable *t = &mxf->index_tables[0]; 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 */ /* find mxf->current_edit_unit so that the next edit unit starts ahead of pkt->pos */
for (;;) { for (;;) {
if (mxf_edit_unit_absolute_offset(mxf, t, mxf->current_edit_unit + 1, NULL, &next_ofs, 0) < 0) if (mxf_edit_unit_absolute_offset(mxf, t, mxf->current_edit_unit + 1, NULL, &next_ofs, 0) < 0)
@ -1795,6 +1799,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
return mxf_read_packet_old(s, pkt); return mxf_read_packet_old(s, pkt);
/* OPAtom - clip wrapped demuxing */ /* OPAtom - clip wrapped demuxing */
/* NOTE: mxf_read_header() makes sure nb_index_tables > 0 for OPAtom */
st = s->streams[0]; st = s->streams[0];
t = &mxf->index_tables[0]; t = &mxf->index_tables[0];