diff asfenc.c @ 4593:0d8b36d98ce2 libavformat

move static tables from asf.h to non-static tables in asf.c this avoid getting those tables duplicated in asfenc.o and asfdec.o

--- a/asfenc.c	Thu Feb 26 15:44:19 2009 +0000
+++ b/asfenc.c	Thu Feb 26 16:17:17 2009 +0000
@@ -303,7 +303,7 @@
         put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */
     }
 
-    put_guid(pb, &asf_header);
+    put_guid(pb, &ff_asf_header);
     put_le64(pb, -1); /* header length, will be patched after */
     put_le32(pb, 3 + has_title + !!metadata_count + s->nb_streams); /* number of chunks in header */
     put_byte(pb, 1); /* ??? */
@@ -311,8 +311,8 @@
 
     /* file header */
     header_offset = url_ftell(pb);
-    hpos = put_header(pb, &file_header);
-    put_guid(pb, &my_guid);
+    hpos = put_header(pb, &ff_asf_file_header);
+    put_guid(pb, &ff_asf_my_guid);
     put_le64(pb, file_size);
     file_time = 0;
     put_le64(pb, unix_to_file_time(file_time));
@@ -327,15 +327,15 @@
     end_header(pb, hpos);
 
     /* unknown headers */
-    hpos = put_header(pb, &head1_guid);
-    put_guid(pb, &head2_guid);
+    hpos = put_header(pb, &ff_asf_head1_guid);
+    put_guid(pb, &ff_asf_head2_guid);
     put_le32(pb, 6);
     put_le16(pb, 0);
     end_header(pb, hpos);
 
     /* title and other infos */
     if (has_title) {
-        hpos = put_header(pb, &comment_header);
+        hpos = put_header(pb, &ff_asf_comment_header);
         put_le16(pb, title     ? 2 * (strlen(title->value    ) + 1) : 0);
         put_le16(pb, author    ? 2 * (strlen(author->value   ) + 1) : 0);
         put_le16(pb, copyright ? 2 * (strlen(copyright->value) + 1) : 0);
@@ -349,7 +349,7 @@
     }
     if (metadata_count) {
         AVMetadataTag *tag = NULL;
-        hpos = put_header(pb, &extended_content_header);
+        hpos = put_header(pb, &ff_asf_extended_content_header);
         put_le16(pb, metadata_count);
         while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
             put_le16(pb, 2*(strlen(tag->key) + 3) + 1);
@@ -388,13 +388,13 @@
             break;
         }
 
-        hpos = put_header(pb, &stream_header);
+        hpos = put_header(pb, &ff_asf_stream_header);
         if (enc->codec_type == CODEC_TYPE_AUDIO) {
-            put_guid(pb, &audio_stream);
-            put_guid(pb, &audio_conceal_spread);
+            put_guid(pb, &ff_asf_audio_stream);
+            put_guid(pb, &ff_asf_audio_conceal_spread);
         } else {
-            put_guid(pb, &video_stream);
-            put_guid(pb, &video_conceal_none);
+            put_guid(pb, &ff_asf_video_stream);
+            put_guid(pb, &ff_asf_video_conceal_none);
         }
         put_le64(pb, 0); /* ??? */
         es_pos = url_ftell(pb);
@@ -444,8 +444,8 @@
 
     /* media comments */
 
-    hpos = put_header(pb, &codec_comment_header);
-    put_guid(pb, &codec_comment1_header);
+    hpos = put_header(pb, &ff_asf_codec_comment_header);
+    put_guid(pb, &ff_asf_codec_comment1_header);
     put_le32(pb, s->nb_streams);
     for(n=0;n<s->nb_streams;n++) {
         AVCodec *p;
@@ -501,9 +501,9 @@
 
     /* movie chunk, followed by packets of packet_size */
     asf->data_offset = cur_pos;
-    put_guid(pb, &data_header);
+    put_guid(pb, &ff_asf_data_header);
     put_le64(pb, data_chunk_size);
-    put_guid(pb, &my_guid);
+    put_guid(pb, &ff_asf_my_guid);
     put_le64(pb, asf->nb_packets); /* nb packets */
     put_byte(pb, 1); /* ??? */
     put_byte(pb, 1); /* ??? */
@@ -793,9 +793,9 @@
     ByteIOContext *pb = s->pb;
     int i;
 
-    put_guid(pb, &simple_index_header);
+    put_guid(pb, &ff_asf_simple_index_header);
     put_le64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count);
-    put_guid(pb, &my_guid);
+    put_guid(pb, &ff_asf_my_guid);
     put_le64(pb, ASF_INDEXED_INTERVAL);
     put_le32(pb, max);
     put_le32(pb, count);