We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch to fix load_flac.c and music_flac.c for gcc2 builds

gcc2.diff (text/plain), 1.69 KB, created by Scott McCreary on 2009-10-08 13:06:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott McCreary

Created: 2009-10-08 13:06:29 UTC

Size: 1.69 KB

patch

obsolete

>Index: load_flac.c
>===================================================================
>--- load_flac.c	(revision 4979)
>+++ load_flac.c	(working copy)
>@@ -151,6 +151,7 @@
> 									void *client_data) {
> 	FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
> 	size_t i;
>+	Uint8 *buf = *(data->sdl_audio_buf);
> 
> 	if (data->flac_total_samples == 0) {
> 		SDL_SetError ("Given FLAC file does not specify its sample count.");
>@@ -176,8 +177,6 @@
>     	}
> 	}
> 
>-	Uint8 *buf = *(data->sdl_audio_buf);
>-
> 	for (i = 0; i < frame->header.blocksize; i++) {
> 		FLAC__int16 i16;
> 		FLAC__uint16 ui16;
>Index: music_flac.c
>===================================================================
>--- music_flac.c	(revision 4979)
>+++ music_flac.c	(working copy)
>@@ -177,6 +177,12 @@
> 	FLAC_music *data = (FLAC_music *)client_data;
> 	size_t i;
> 
>+	FLAC__int16 i16;
>+	FLAC__uint16 ui16;
>+
>+	i16 = (FLAC__int16)buffer[0][i];
>+	ui16 = (FLAC__uint16)i16;
>+			
> 	if (data->flac_data.total_samples == 0) {
> 		SDL_SetError ("Given FLAC file does not specify its sample count.");
> 		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
>@@ -206,12 +212,6 @@
> 				}
> 			}
> 
>-			FLAC__int16 i16;
>-			FLAC__uint16 ui16;
>-
>-			i16 = (FLAC__int16)buffer[0][i];
>-			ui16 = (FLAC__uint16)i16;
>-
> 			*((data->flac_data.data) + (data->flac_data.data_read++)) =
> 															(char)(ui16);
> 			*((data->flac_data.data) + (data->flac_data.data_read++)) =
>@@ -249,12 +249,6 @@
> 				}
> 			}
> 
>-			FLAC__int16 i16;
>-			FLAC__uint16 ui16;
>-
>-			i16 = (FLAC__int16)buffer[0][i];
>-			ui16 = (FLAC__uint16)i16;
>-
> 			*((data->flac_data.overflow) + (data->flac_data.overflow_read++)) =
> 															(char)(ui16);
> 			*((data->flac_data.overflow) + (data->flac_data.overflow_read++)) =

Actions: View | Diff

Attachments on bug 832: 403

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.