Mercurial > mplayer.hg
changeset 31997:a3890036b137
Add proper include instead of declaring the vo_pts variable extern.
| author | diego |
|---|---|
| date | Wed, 08 Sep 2010 18:16:06 +0000 |
| parents | 6ba4e1cfbaf9 |
| children | 28fb4ef194f9 |
| files | libao2/ao_dxr2.c libao2/ao_ivtv.c libao2/ao_mpegpes.c libao2/ao_pcm.c libao2/ao_v4l2.c |
| diffstat | 5 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_dxr2.c Wed Sep 08 18:02:38 2010 +0000 +++ b/libao2/ao_dxr2.c Wed Sep 08 18:16:06 2010 +0000 @@ -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 @@ { } -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;
--- a/libao2/ao_ivtv.c Wed Sep 08 18:02:38 2010 +0000 +++ b/libao2/ao_ivtv.c Wed Sep 08 18:16:06 2010 +0000 @@ -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 @@ static int get_space (void) { - extern int vo_pts; float x; int y;
--- a/libao2/ao_mpegpes.c Wed Sep 08 18:02:38 2010 +0000 +++ b/libao2/ao_mpegpes.c Wed Sep 08 18:16:06 2010 +0000 @@ -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 @@ { } -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;
--- a/libao2/ao_pcm.c Wed Sep 08 18:02:38 2010 +0000 +++ b/libao2/ao_pcm.c Wed Sep 08 18:16:06 2010 +0000 @@ -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 @@ LIBAO_EXTERN(pcm) -extern int vo_pts; - static char *ao_outputfilename = NULL; static int ao_pcm_waveheader = 1; static int fast = 0;
--- a/libao2/ao_v4l2.c Wed Sep 08 18:02:38 2010 +0000 +++ b/libao2/ao_v4l2.c Wed Sep 08 18:16:06 2010 +0000 @@ -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 @@ static int get_space (void) { - extern int vo_pts; float x; int y;