- �a compile sous FreeBSD (mais �a ne tourne pas)

[vlc] / include / input_netlist.h

diff --git a/include/input_netlist.h b/include/input_netlist.h
index 4e1c8b5ccf73ebfbf841fcecd7cfd632dd9cd7b7..c5b6a0c3d0b80207883ac8b929649d5882bc0417 100644 (file)
--- a/include/input_netlist.h
+++ b/include/input_netlist.h
@@ -1,10 +1,27 @@
 /*****************************************************************************
  * input_netlist.h: netlist interface
- * (c)1998 VideoLAN
- *****************************************************************************
  * The netlists are an essential part of the input structure. We maintain a
  * list of free TS packets and free PES packets to avoid continuous malloc
  * and free.
+ *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * 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-1307, USA.
  *****************************************************************************/
 
 #include "intf_msg.h"
@@ -46,10 +63,10 @@ static __inline__ void input_NetlistFreePES( input_thread_t *p_input,
 #ifdef INPUT_LIFO_TS_NETLIST
         p_input->netlist.i_ts_index--;
         p_input->netlist.p_ts_free[p_input->netlist.i_ts_index].iov_base
-                             = p_ts_packet;
+                             = (void *)p_ts_packet;
 #else /* FIFO */
         p_input->netlist.p_ts_free[p_input->netlist.i_ts_end].iov_base
-                             = p_ts_packet;
+                             = (void *)p_ts_packet;
         p_input->netlist.i_ts_end++;
         p_input->netlist.i_ts_end &= INPUT_MAX_TS; /* loop */
 #endif
@@ -87,9 +104,11 @@ static __inline__ void input_NetlistFreeTS( input_thread_t *p_input,
     /* Free the TS structure. */
 #ifdef INPUT_LIFO_TS_NETLIST
     p_input->netlist.i_ts_index--;
-    p_input->netlist.p_ts_free[p_input->netlist.i_ts_index].iov_base = p_ts_packet;
+    p_input->netlist.p_ts_free[p_input->netlist.i_ts_index].iov_base
+        = (void *)p_ts_packet;
 #else /* FIFO */
-    p_input->netlist.p_ts_free[p_input->netlist.i_ts_end].iov_base = p_ts_packet;
+    p_input->netlist.p_ts_free[p_input->netlist.i_ts_end].iov_base
+        = (void *)p_ts_packet;
     p_input->netlist.i_ts_end++;
     p_input->netlist.i_ts_end &= INPUT_MAX_TS; /* loop */
 #endif