Mercurial > libavformat.hg

changeset 1562:61df6b5d52d3 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use amf_get_string()
author michael
date Sun, 10 Dec 2006 17:38:16 +0000
parents a21addc40d10
children bf3589ba8d7e
files flvdec.c
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/flvdec.c	Sun Dec 10 17:32:05 2006 +0000
+++ b/flvdec.c	Sun Dec 10 17:38:16 2006 +0000
@@ -135,20 +135,14 @@
             int type, len;
             double d= 0;
 
-            len= get_be16(&s->pb);
-            if(len >= sizeof(tmp) || !len)
+            if(amf_get_string(&s->pb, tmp, sizeof(tmp))<0)
                 break;
-            get_buffer(&s->pb, tmp, len);
-            tmp[len]=0;
 
             type= get_byte(&s->pb);
             if(type == AMF_DATA_TYPE_NUMBER){
                 d= av_int2dbl(get_be64(&s->pb));
             }else if(type == AMF_DATA_TYPE_STRING){
-                len= get_be16(&s->pb);
-                if(len >= sizeof(tmp))
-                    break;
-                url_fskip(&s->pb, len);
+                amf_get_string(&s->pb, NULL, 0);
             }else if(type == AMF_DATA_TYPE_MIXEDARRAY){
                 //array
                 break;