diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-17 23:51:37 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-17 23:51:37 +0000 |
| commit | c6eed70a1316fe7207c3b3ce5d8aa76360b13833 (patch) | |
| tree | 4f644341d806c79eae0f5353f4cd787582034aa7 /libao2/ao_dxr2.c | |
| parent | 7562937d959ec617d4f78fd6d06aed7164b22255 (diff) | |
| download | mpv-c6eed70a1316fe7207c3b3ce5d8aa76360b13833.tar.bz2 mpv-c6eed70a1316fe7207c3b3ce5d8aa76360b13833.tar.xz | |
Workaround the bug in x11 vo's (if it's one) wich let a window in the way
even after vo->uninit().
Support for dvd/vobsub subtitles.
No more crash if vo->config is not called before vo->uninit()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6112 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_dxr2.c')
| -rw-r--r-- | libao2/ao_dxr2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c index 4164824413..8f0d28d50f 100644 --- a/libao2/ao_dxr2.c +++ b/libao2/ao_dxr2.c @@ -68,6 +68,9 @@ static int freq_id=0; // return: 1=success 0=fail static int init(int rate,int channels,int format,int flags){ + if(dxr2_fd <= 0) + return 0; + ao_data.outburst=2048; ao_data.samplerate=rate; ao_data.channels=channels; @@ -139,7 +142,6 @@ static void audio_resume() extern void dxr2_send_packet(unsigned char* data,int len,int id,int timestamp); extern void dxr2_send_lpcm_packet(unsigned char* data,int len,int id,int timestamp,int freq_id); extern int vo_pts; -static int preload = 1; // return: how many bytes can be played without blocking static int get_space(){ float x=(float)(vo_pts-ao_data.pts)/90000.0; |