[MPlayer-cvslog] r32081 - in trunk/libao2: ao_dxr2.c ao_ivtv.c ao_mpegpes.c ao_pcm.c ao_v4l2.c

[diego]

Author: diego
Date: Wed Sep  8 20:16:06 2010
New Revision: 32081

Log:
Add proper include instead of declaring the vo_pts variable extern.

Modified:
   trunk/libao2/ao_dxr2.c
   trunk/libao2/ao_ivtv.c
   trunk/libao2/ao_mpegpes.c
   trunk/libao2/ao_pcm.c
   trunk/libao2/ao_v4l2.c

Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c	Wed Sep  8 20:02:38 2010	(r32080)
+++ trunk/libao2/ao_dxr2.c	Wed Sep  8 20:16:06 2010	(r32081)
@@ -34,6 +34,7 @@
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
 #include "libmpdemux/mpeg_packetizer.h"
+#include "libvo/video_out.h"
 
 
 static const ao_info_t info =
@@ -164,7 +165,6 @@ static void audio_resume(void)
 {
 }
 
-extern int vo_pts;
 // return: how many bytes can be played without blocking
 static int get_space(void){
     float x=(float)(vo_pts-ao_data.pts)/90000.0;

Modified: trunk/libao2/ao_ivtv.c
==============================================================================
--- trunk/libao2/ao_ivtv.c	Wed Sep  8 20:02:38 2010	(r32080)
+++ trunk/libao2/ao_ivtv.c	Wed Sep  8 20:16:06 2010	(r32081)
@@ -37,6 +37,7 @@
 #include "libaf/af_format.h"
 #include "libmpdemux/mpeg_packetizer.h"
 #include "libvo/vo_ivtv.h"
+#include "libvo/video_out.h"
 
 #define MPEG_AUDIO_ID 0x1C0
 
@@ -126,7 +127,6 @@ audio_resume (void)
 static int
 get_space (void)
 {
-  extern int vo_pts;
   float x;
   int y;
 

Modified: trunk/libao2/ao_mpegpes.c
==============================================================================
--- trunk/libao2/ao_mpegpes.c	Wed Sep  8 20:02:38 2010	(r32080)
+++ trunk/libao2/ao_mpegpes.c	Wed Sep  8 20:16:06 2010	(r32081)
@@ -35,6 +35,7 @@
 
 #include "libaf/af_format.h"
 #include "libmpdemux/mpeg_packetizer.h"
+#include "libvo/video_out.h"
 #include "subopt-helper.h"
 
 #include "mp_msg.h"
@@ -299,8 +300,6 @@ static void audio_resume(void)
 {
 }
 
-extern int vo_pts;
-
 // return: how many bytes can be played without blocking
 static int get_space(void){
     float x=(float)(vo_pts-ao_data.pts)/90000.0;

Modified: trunk/libao2/ao_pcm.c
==============================================================================
--- trunk/libao2/ao_pcm.c	Wed Sep  8 20:02:38 2010	(r32080)
+++ trunk/libao2/ao_pcm.c	Wed Sep  8 20:16:06 2010	(r32081)
@@ -29,6 +29,7 @@
 #include "subopt-helper.h"
 #include "libaf/af_format.h"
 #include "libaf/reorder_ch.h"
+#include "libvo/video_out.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "mp_msg.h"
@@ -49,8 +50,6 @@ static const ao_info_t info =
 
 LIBAO_EXTERN(pcm)
 
-extern int vo_pts;
-
 static char *ao_outputfilename = NULL;
 static int ao_pcm_waveheader = 1;
 static int fast = 0;

Modified: trunk/libao2/ao_v4l2.c
==============================================================================
--- trunk/libao2/ao_v4l2.c	Wed Sep  8 20:02:38 2010	(r32080)
+++ trunk/libao2/ao_v4l2.c	Wed Sep  8 20:16:06 2010	(r32081)
@@ -33,6 +33,7 @@
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
 #include "libmpdemux/mpeg_packetizer.h"
+#include "libvo/video_out.h"
 #include "libvo/vo_v4l2.h"
 
 #define MPEG_AUDIO_ID 0x1C0
@@ -123,7 +124,6 @@ audio_resume (void)
 static int
 get_space (void)
 {
-  extern int vo_pts;
   float x;
   int y;