Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

move vars decls where vars are used

Browse source 
Originally committed as revision 12970 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-04-25 16:47:22 +00:00
parent 3b4eccabae
commit baf9fb32c0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libavformat/mov.c
View file

@ -669,12 +669,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{ {
AVStream *st = c->fc->streams[c->fc->nb_streams-1]; AVStream *st = c->fc->streams[c->fc->nb_streams-1];
MOVStreamContext *sc = st->priv_data; MOVStreamContext *sc = st->priv_data;
int entries, frames_per_sample; int j, entries, pseudo_stream_id;
uint32_t format;
uint8_t codec_name[32];
unsigned int color_depth;
int color_greyscale;
int j, pseudo_stream_id;
get_byte(pb); /* version */ get_byte(pb); /* version */
get_be24(pb); /* flags */ get_be24(pb); /* flags */
@ -688,7 +683,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
MOV_atom_t a = { 0, 0, 0 }; MOV_atom_t a = { 0, 0, 0 };
offset_t start_pos = url_ftell(pb); offset_t start_pos = url_ftell(pb);
int size = get_be32(pb); /* size */ 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_be32(pb); /* reserved */
get_be16(pb); /* reserved */ get_be16(pb); /* reserved */
@ -733,6 +728,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
(format >> 24) & 0xff, st->codec->codec_type); (format >> 24) & 0xff, st->codec->codec_type);
if(st->codec->codec_type==CODEC_TYPE_VIDEO) { 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; st->codec->codec_id = id;
get_be16(pb); /* version */ get_be16(pb); /* version */
get_be16(pb); /* revision level */ get_be16(pb); /* revision level */