RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

save pointer to parse table, it is unlikely to change 

Originally committed as revision 11237 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-12-16 18:20:27 +00:00
parent 23d2cfe9a5
commit 73d07c275a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/mov.c
View File

@ -118,10 +118,6 @@ typedef struct MOVContext {
int64_t mdat_offset;
int total_streams;
MOVStreamContext *streams[MAX_STREAMS];
const struct MOVParseTableEntry *parse_table; /* could be eventually used to change the table */
/* NOTE: for recursion save to/ restore from local variable! */
AVPaletteControl palette_control;
MOV_mdat_t *mdat_list;
int mdat_count;
@ -147,6 +143,8 @@ typedef struct MOVParseTableEntry {
mov_parse_function func;
} MOVParseTableEntry;
static const MOVParseTableEntry mov_default_parse_table[];
static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
int64_t total_size = 0;
@ -183,16 +181,16 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
break;
a.size = FFMIN(a.size, atom.size - total_size);
for (i = 0; c->parse_table[i].type != 0L
&& c->parse_table[i].type != a.type; i++)
for (i = 0; mov_default_parse_table[i].type != 0L
&& mov_default_parse_table[i].type != a.type; i++)
/* empty */;
if (c->parse_table[i].type == 0) { /* skip leaf atoms data */
if (mov_default_parse_table[i].type == 0) { /* skip leaf atoms data */
url_fskip(pb, a.size);
} else {
offset_t start_pos = url_ftell(pb);
int64_t left;
err = (c->parse_table[i].func)(c, pb, a);
err = (mov_default_parse_table[i].func)(c, pb, a);
if (c->found_moov && c->found_mdat)
break;
left = a.size - url_ftell(pb) + start_pos;
@ -1427,7 +1425,6 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
MOV_atom_t atom = { 0, 0, 0 };
mov->fc = s;
mov->parse_table = mov_default_parse_table;
if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
atom.size = url_fsize(pb);