From: Martin Storsjö <martin@martin.st>
Date: Tue, 11 Oct 2011 20:56:39 +0000 (+0300)
Subject: flvdec: Split out setting of numeric fields from storing metadata
X-Git-Tag: android-x86-4.4-r1~8529^2~5170
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b204c46d9d31af3d8beab359efde246d293cd676;p=android-x86%2Fexternal-ffmpeg.git

flvdec: Split out setting of numeric fields from storing metadata

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ad00c65e25..815618d5f8 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -287,17 +287,21 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
         acodec = astream ? astream->codec : NULL;
         vcodec = vstream ? vstream->codec : NULL;
 
+        if (amf_type == AMF_DATA_TYPE_NUMBER) {
+            if (!strcmp(key, "duration"))
+                s->duration = num_val * AV_TIME_BASE;
+            else if (!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0))
+                vcodec->bit_rate = num_val * 1024.0;
+            else if (!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0))
+                acodec->bit_rate = num_val * 1024.0;
+        }
+
         if(amf_type == AMF_DATA_TYPE_BOOL) {
             av_strlcpy(str_val, num_val > 0 ? "true" : "false", sizeof(str_val));
             av_dict_set(&s->metadata, key, str_val, 0);
         } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
             snprintf(str_val, sizeof(str_val), "%.f", num_val);
             av_dict_set(&s->metadata, key, str_val, 0);
-            if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE;
-            else if(!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0))
-                vcodec->bit_rate = num_val * 1024.0;
-            else if(!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0))
-                acodec->bit_rate = num_val * 1024.0;
         } else if (amf_type == AMF_DATA_TYPE_STRING)
             av_dict_set(&s->metadata, key, str_val, 0);
     }