RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-29 03:02:53 +00:00
Code Issues Releases Wiki Activity

Updated changelog

Browse Source 
Removed unneeded ifdefs
No longer set static variables to 0


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8725 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mswitch 2003-01-02 21:45:13 +00:00
parent 6f6f3f2480
commit 9ed7d6dd03
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libvo/vo_dxr3.c
View File

@ -7,7 +7,8 @@
/* ChangeLog added 2002-01-10 /* ChangeLog added 2002-01-10
* 2003-01-02: * 2003-01-02:
* Added patch that makes vo_dxr3 return to previous TV norm after quiting. * Added patch from Jens Axboe that makes vo_dxr3 return to previous TV norm
* after quiting.
* *
* 2002-12-24: (Hohoho) * 2002-12-24: (Hohoho)
* Added patch from Thomas Jarosch <tomj@simonv.com> which adds support * Added patch from Thomas Jarosch <tomj@simonv.com> which adds support
@ -149,8 +150,8 @@ LIBVO_EXTERN (dxr3)
static int v_width, v_height; static int v_width, v_height;
static int s_width, s_height; static int s_width, s_height;
static int osd_w, osd_h; static int osd_w, osd_h;
static int fullscreen = 0; static int fullscreen;
static int img_format = 0; static int img_format;
/* Configuration values /* Configuration values
* Don't declare these static, they * Don't declare these static, they
@ -171,19 +172,19 @@ static char fds_name[80];
#ifdef SPU_SUPPORT #ifdef SPU_SUPPORT
/* on screen display/subpics */ /* on screen display/subpics */
static char *osdpicbuf = NULL; static char *osdpicbuf;
static int osdpicbuf_w; static int osdpicbuf_w;
static int osdpicbuf_h; static int osdpicbuf_h;
static int disposd = 0; static int disposd;
static encodedata *spued; static encodedata *spued;
static encodedata *spubuf; static encodedata *spubuf;
#endif #endif
/* Static variable used in ioctl's */ /* Static variable used in ioctl's */
static int ioval = 0; static int ioval;
static int prev_pts = 0; static int prev_pts;
static int pts_offset = 0; static int pts_offset;
static int old_vmode = -1; static int old_vmode = -1;
@ -424,20 +425,16 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
} }
/* Start em8300 prebuffering and sync engine */ /* Start em8300 prebuffering and sync engine */
#ifdef MVCOMMAND_SYNC
reg.microcode_register = 1; reg.microcode_register = 1;
reg.reg = 0; reg.reg = 0;
reg.val = MVCOMMAND_SYNC; reg.val = MVCOMMAND_SYNC;
ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg); ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg);
#endif
#ifdef EM8300_IOCTL_FLUSH
/* Clean buffer by syncing it */ /* Clean buffer by syncing it */
ioval = EM8300_SUBDEVICE_VIDEO; ioval = EM8300_SUBDEVICE_VIDEO;
ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval); ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval);
ioval = EM8300_SUBDEVICE_AUDIO; ioval = EM8300_SUBDEVICE_AUDIO;
ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval); ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval);
#endif
/* Sync the video device to make sure the buffers are empty /* Sync the video device to make sure the buffers are empty
* and set the playback speed to normal. Also reset the * and set the playback speed to normal. Also reset the