Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / access / rtp / rtp.h

diff --git a/modules/access/rtp/rtp.h b/modules/access/rtp/rtp.h
index 15cbfad74c1712826cbca3773346196db428cadc..c90b01080a93e0cb0272b20d3ee96bc81bff4c8d 100644 (file)
--- a/modules/access/rtp/rtp.h
+++ b/modules/access/rtp/rtp.h
@@ -7,7 +7,7 @@
  *
  * This library 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.0
+ * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
  * 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 Lesser General Public
+ * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  ****************************************************************************/
@@ -52,20 +52,22 @@ void *rtp_thread (void *data);
 struct demux_sys_t
 {
     rtp_session_t *session;
+#ifdef HAVE_SRTP
     struct srtp_session_t *srtp;
+#endif
     int           fd;
     int           rtcp_fd;
     vlc_thread_t  thread;
     vlc_timer_t   timer;
     vlc_mutex_t   lock;
-    bool thread_ready;
 
+    mtime_t       timeout;
     unsigned      caching;
-    unsigned      timeout;
     uint16_t      max_dropout; /**< Max packet forward misordering */
     uint16_t      max_misorder; /**< Max packet backward misordering */
     uint8_t       max_src; /**< Max simultaneous RTP sources */
     bool          framed_rtp; /**< Framed RTP packets over TCP */
+    bool          thread_ready;
 #if 0
     bool          dead; /**< End of stream */
 #endif