Fix a race on b_first_frame.

[vlc] / modules / access / rtsp / real.h

diff --git a/modules/access/rtsp/real.h b/modules/access/rtsp/real.h
index 4eff4cbb01f3a449abb496a79ff74ca94b131d12..51392e5ff6a27507e62a1e730fae97d2e963804d 100644 (file)
--- a/modules/access/rtsp/real.h
+++ b/modules/access/rtsp/real.h
@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 2002-2004 the xine project
  * Copyright (C) 2005 VideoLAN
- * $Id: file.c 10310 2005-03-11 22:36:40Z anil $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *          Adapted from xine which itself adapted it from joschkas real tools.
@@ -20,16 +20,20 @@
  *
  * 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.
  *****************************************************************************/
 #ifndef HAVE_REAL_H
 #define HAVE_REAL_H
 
+#ifdef HAVE_CONFIG_H 
+# include "config.h" 
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "rtsp.h"
 #include "real_rmff.h"
 #include "real_sdpplin.h"
@@ -37,13 +41,13 @@
 #ifdef REALDEBUG
 #   define lprintf printf
 #else
-    static inline void lprintf( char *dummy, ... ){}
+    static inline void lprintf( const char *dummy, ... ) { (void)dummy; }
 #endif
 
 int real_get_rdt_chunk_header(rtsp_client_t *, rmff_pheader_t *);
 int real_get_rdt_chunk(rtsp_client_t *, rmff_pheader_t *, unsigned char **);
 rmff_header_t *real_setup_and_get_header(rtsp_client_t *, int bandwidth);
 
-int asmrp_match(const char *rules, int bandwidth, int *matches) ;
+int asmrp_match(const char *rules, int bandwidth, int *matches, int matchsize) ;
 
 #endif