[SCM] libav/experimental: asfdec: skip byte array tags. Patch from Anton Khirnov wyskas gmail

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:01:25 UTC 2013


The following commit has been merged in the experimental branch:
commit 6538c0f1c6df00b0e3a57157be7ed7f00f174f64
Author: Benoit Fouet <benoit.fouet at free.fr>
Date:   Wed Feb 24 07:34:12 2010 +0000

    asfdec: skip byte array tags.
    Patch from Anton Khirnov wyskas gmail
    
    Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 129f596..3ccadeb 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -161,9 +161,9 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len)
     if (!value)
         return;
 
-    if (type <= 1) {         // unicode or byte
+    if (type == 0) {         // UTF16-LE
         get_str16_nolen(s->pb, len, value, len);
-    } else if (type <= 5) {  // boolean or DWORD or QWORD or WORD
+    } else if (type > 1 && type <= 5) {  // boolean or DWORD or QWORD or WORD
         uint64_t num = get_value(s->pb, type);
         snprintf(value, len, "%"PRIu64, num);
     } else {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list