Pah; we cannot free these variables, since they are const.

[vlc] / modules / access / mms / asf.h

diff --git a/modules/access/mms/asf.h b/modules/access/mms/asf.h
index 8712da73493ab99dd51f558f527b584b7d75ea11..049328c9244b34f783f7d986ad69b63180a7f526 100644 (file)
--- a/modules/access/mms/asf.h
+++ b/modules/access/mms/asf.h
@@ -18,16 +18,19 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /****************************************************************************
  * XXX:
  *  Definitions and data duplicated from asf demuxers but I want access
- * and demux plugins to be independant
+ * and demux plugins to be independent
  *
  ****************************************************************************/
 
+#ifndef _ASF_H_
+#define _ASF_H_ 1
+
 #define ASF_STREAM_VIDEO    0x0001
 #define ASF_STREAM_AUDIO    0x0002
 #define ASF_STREAM_UNKNOWN  0xffff
@@ -49,7 +52,6 @@ typedef struct
 
 } asf_header_t;
 
-
 typedef struct guid_s
 {
     uint32_t v1; /* le */
@@ -59,12 +61,11 @@ typedef struct guid_s
 } guid_t;
 
 
-void E_( GenerateGuid )     ( guid_t * );
-void E_( asf_HeaderParse )  ( asf_header_t *, uint8_t *, int );
-void E_( asf_StreamSelect ) ( asf_header_t *,
-                              int i_bitrate_max, vlc_bool_t b_all, vlc_bool_t b_audio,
-                              vlc_bool_t b_video );
-
+void  GenerateGuid      ( guid_t * );
+void  asf_HeaderParse   ( asf_header_t *, uint8_t *, int );
+void  asf_StreamSelect  ( asf_header_t *,
+                              int i_bitrate_max, bool b_all, bool b_audio,
+                              bool b_video );
 
 #define GUID_FMT "%8.8x-%4.4x-%4.4x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
 #define GUID_PRINT( guid )  \
@@ -145,3 +146,5 @@ static const guid_t asf_object_header_extension_guid =
     0x11CF,
     { 0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }
 };
+
+#endif