[SCM] libav/experimental: gxfenc: Fix ES name in the UMF media description, by using strlen instead of sizeof

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:12:03 UTC 2013


The following commit has been merged in the experimental branch:
commit 591db22dffa3871774c00a410d3c1196ecb0f3f6
Author: Thierry Foucu <tfoucu at gmail.com>
Date:   Wed Jul 21 07:46:02 2010 +0000

    gxfenc: Fix ES name in the UMF media description, by using strlen instead of sizeof
    
    Patch by Thierry Foucu, tfoucu at gmail
    
    Originally committed as revision 24379 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index a6f4b72..b20a842 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -550,9 +550,9 @@ static int gxf_write_umf_media_description(AVFormatContext *s)
         put_le32(pb, 0); /* attributes rw, ro */
         put_le32(pb, 0); /* mark in */
         put_le32(pb, gxf->nb_fields); /* mark out */
-        put_buffer(pb, ES_NAME_PATTERN, sizeof(ES_NAME_PATTERN));
+        put_buffer(pb, ES_NAME_PATTERN, strlen(ES_NAME_PATTERN));
         put_be16(pb, sc->media_info);
-        for (j = sizeof(ES_NAME_PATTERN)+2; j < 88; j++)
+        for (j = strlen(ES_NAME_PATTERN)+2; j < 88; j++)
             put_byte(pb, 0);
         put_le32(pb, sc->track_type);
         put_le32(pb, sc->sample_rate);
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index d147bc4..5dc3ea7 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,3 +1,3 @@
-b52bf18b403ac9a0d12048b2f66cb24c *./tests/data/lavf/lavf.gxf
+5b9c8da067585aeb04e5fb31e021cbfd *./tests/data/lavf/lavf.gxf
 796392 ./tests/data/lavf/lavf.gxf
 ./tests/data/lavf/lavf.gxf CRC=0xad9e86eb

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list