diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-02-06 19:16:18 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-02-06 19:16:18 +0000 |
| commit | 8bacb137f813721b0cf6f40049007c195dae1944 (patch) | |
| tree | a23e66845e48df55062dc091ea330f49e9b7f288 /src | |
| parent | a7dbf248a61c72af76213dcee3a8e3f51ac6d23c (diff) | |
| download | xine-lib-8bacb137f813721b0cf6f40049007c195dae1944.tar.gz xine-lib-8bacb137f813721b0cf6f40049007c195dae1944.tar.bz2 | |
**BUGFIX**
Updated win32 M$VC port.
CVS patchset: 7386
CVS date: 2005/02/06 19:16:18
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_directx2_out.c | 4 | ||||
| -rw-r--r-- | src/video_out/alphablend.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index 48d45cec3..a86920e0f 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_directx2_out.c,v 1.1 2005/02/04 22:31:32 valtri Exp $ + * $Id: audio_directx2_out.c,v 1.2 2005/02/06 19:16:18 valtri Exp $ * * * xine audio output plugin using DirectX @@ -425,7 +425,7 @@ static int audio_fill(dx2_driver_t *this, char *data, size_t size) { err = IDirectSoundBuffer_Lock(this->dsbuffer, (this->count * this->part_size + this->read_size) % this->buffer_size, size, &ptr1, &size1, &ptr2, &size2, 0); /* try to restore the buffer, if necessary */ if (err == DSERR_BUFFERLOST) { - xine_log(this->class->xine, XINE_LOG_MSG, _(LOG_MODULE ": buffer lost, try to restore\n")); + xine_log(this->class->xine, XINE_LOG_MSG, _(LOG_MODULE ": buffer lost, tryig to restore\n")); IDirectSoundBuffer_Restore(this->dsbuffer); err = IDirectSoundBuffer_Lock(this->dsbuffer, (this->count * this->part_size + this->read_size) % this->buffer_size, size, &ptr1, &size1, &ptr2, &size2, 0); } if (err != DS_OK) { diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c index 03beb8605..b2ac9f2ac 100644 --- a/src/video_out/alphablend.c +++ b/src/video_out/alphablend.c @@ -863,7 +863,7 @@ static uint8_t *(*blend_yuv_grow_extra_data(alphablend_t *extra_data, int osd_wi uint8_t *data[ 3 ][ 2 ]; } **header = (struct header_s **)&extra_data->buffer; - int needed_buffer_size = sizeof (**header) + sizeof (uint8_t[ 3 ][ 2 ][ osd_width ]); + int needed_buffer_size = sizeof (**header) + osd_width * sizeof (uint8_t[ 3 ][ 2 ]); if (extra_data->buffer_size < needed_buffer_size) { @@ -1248,7 +1248,7 @@ static uint8_t *(*blend_yuy2_grow_extra_data(alphablend_t *extra_data, int osd_w uint8_t *data[ 3 ]; } **header = (struct header_s **)&extra_data->buffer; - int needed_buffer_size = sizeof (**header) + sizeof (uint8_t[ 3 ][ osd_width ]); + int needed_buffer_size = sizeof (**header) + osd_width * sizeof (uint8_t[ 3 ]); if (extra_data->buffer_size < needed_buffer_size) { |