# HG changeset patch # User bcoudurier # Date 1209142042 0 # Node ID d9a40edc615a69d76c8162e03e236b63663189c1 # Parent 07299732f3b8df2732332397a2357c10a4e89add move vars decls where vars are used diff -r 07299732f3b8 -r d9a40edc615a mov.c --- a/mov.c Fri Apr 25 14:09:42 2008 +0000 +++ b/mov.c Fri Apr 25 16:47:22 2008 +0000 @@ -669,12 +669,7 @@ { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; MOVStreamContext *sc = st->priv_data; - int entries, frames_per_sample; - uint32_t format; - uint8_t codec_name[32]; - unsigned int color_depth; - int color_greyscale; - int j, pseudo_stream_id; + int j, entries, pseudo_stream_id; get_byte(pb); /* version */ get_be24(pb); /* flags */ @@ -688,7 +683,7 @@ MOV_atom_t a = { 0, 0, 0 }; offset_t start_pos = url_ftell(pb); int size = get_be32(pb); /* size */ - format = get_le32(pb); /* data format */ + uint32_t format = get_le32(pb); /* data format */ get_be32(pb); /* reserved */ get_be16(pb); /* reserved */ @@ -733,6 +728,11 @@ (format >> 24) & 0xff, st->codec->codec_type); if(st->codec->codec_type==CODEC_TYPE_VIDEO) { + uint8_t codec_name[32]; + unsigned int color_depth; + int color_greyscale; + int frames_per_sample; + st->codec->codec_id = id; get_be16(pb); /* version */ get_be16(pb); /* revision level */