[FFmpeg-cvslog] r24379 - in trunk: libavformat/gxfenc.c tests/ref/lavf/gxf

[mstorsjo]

Author: mstorsjo
Date: Wed Jul 21 09:46:02 2010
New Revision: 24379

Log:
gxfenc: Fix ES name in the UMF media description, by using strlen instead of sizeof

Patch by Thierry Foucu, tfoucu at gmail

Modified:
   trunk/libavformat/gxfenc.c
   trunk/tests/ref/lavf/gxf

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	Wed Jul 21 00:58:56 2010	(r24378)
+++ trunk/libavformat/gxfenc.c	Wed Jul 21 09:46:02 2010	(r24379)
@@ -550,9 +550,9 @@ static int gxf_write_umf_media_descripti
         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);

Modified: trunk/tests/ref/lavf/gxf
==============================================================================
--- trunk/tests/ref/lavf/gxf	Wed Jul 21 00:58:56 2010	(r24378)
+++ trunk/tests/ref/lavf/gxf	Wed Jul 21 09:46:02 2010	(r24379)
@@ -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