Mercurial > libavformat.hg

changeset 3263:d9a40edc615a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move vars decls where vars are used
author bcoudurier
date Fri, 25 Apr 2008 16:47:22 +0000
parents 07299732f3b8
children 5eaed4c6b97f
files mov.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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 */