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

clean 

Originally committed as revision 5194 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-03-22 10:56:51 +00:00
parent 1175561e19
commit f444b977a5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/mov.c
View File

@ -668,24 +668,30 @@ static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{ {
int version; AVStream *st = c->fc->streams[c->fc->nb_streams-1];
MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
int version = get_byte(pb);
int lang; int lang;
version = get_byte(pb); /* version */
if (version > 1) if (version > 1)
return 1; /* unsupported */ return 1; /* unsupported */
get_byte(pb); get_byte(pb); get_byte(pb); get_byte(pb);
get_byte(pb); /* flags */ get_byte(pb); /* flags */
(version==1)?get_be64(pb):get_be32(pb); /* creation time */ if (version == 1) {
(version==1)?get_be64(pb):get_be32(pb); /* modification time */ get_be64(pb);
get_be64(pb);
} else {
get_be32(pb); /* creation time */
get_be32(pb); /* modification time */
}
c->streams[c->fc->nb_streams-1]->time_scale = get_be32(pb); sc->time_scale = get_be32(pb);
c->fc->streams[c->fc->nb_streams-1]->duration = (version==1)?get_be64(pb):get_be32(pb); /* duration */ st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
lang = get_be16(pb); /* language */ lang = get_be16(pb); /* language */
ff_mov_lang_to_iso639(lang, c->fc->streams[c->fc->nb_streams-1]->language); ff_mov_lang_to_iso639(lang, st->language);
get_be16(pb); /* quality */ get_be16(pb); /* quality */
return 0; return 0;
@ -1339,12 +1345,8 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{ {
AVStream *st; AVStream *st = c->fc->streams[c->fc->nb_streams-1];
int version; int version = get_byte(pb);
st = c->fc->streams[c->fc->nb_streams-1];
version = get_byte(pb); /* version */
get_byte(pb); get_byte(pb); get_byte(pb); get_byte(pb);
get_byte(pb); /* flags */ get_byte(pb); /* flags */