From e0f8f99a19057dc5492d30d483964901efcd7f20 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 11 Sep 2010 14:13:21 +0000 Subject: ao_mpegpes,vo_mpegpes: Rename vo_mpegpes_fd2 variable to ao_mpegpes_fd git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32154 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_mpegpes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libvo/vo_mpegpes.c') diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index c5ef3b91c3..dc63579519 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -58,7 +58,7 @@ #include "libmpdemux/mpeg_packetizer.h" int vo_mpegpes_fd=-1; -extern int vo_mpegpes_fd2; +extern int ao_mpegpes_fd; static const vo_info_t info = { @@ -175,7 +175,7 @@ static int my_write(const unsigned char* data,int len){ pfd[0].fd = vo_mpegpes_fd; pfd[0].events = POLLOUT; - pfd[1].fd = vo_mpegpes_fd2; + pfd[1].fd = ao_mpegpes_fd; pfd[1].events = POLLOUT; while(len>0){ @@ -231,8 +231,8 @@ query_format(uint32_t format) static void uninit(void) { - if(vo_mpegpes_fd2>=0 && vo_mpegpes_fd2!=vo_mpegpes_fd) close(vo_mpegpes_fd2); - vo_mpegpes_fd2=-1; + if(ao_mpegpes_fd >= 0 && ao_mpegpes_fd != vo_mpegpes_fd) close(ao_mpegpes_fd); + ao_mpegpes_fd =- 1; if(vo_mpegpes_fd>=0){ close(vo_mpegpes_fd);vo_mpegpes_fd=-1;} } -- cgit v1.2.3