diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2009-03-26 11:37:28 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-03-26 11:37:28 +0100 |
| commit | 7ff9bdb45659fdfbc434a202c0588c6a271bef0a (patch) | |
| tree | f4fd8dbee8bcae101320033b82e59266065cc108 /sys/acmmp3dec | |
| parent | f5b298e3d7687dbd349ff920eaa22d7f958a0653 (diff) | |
acm: Port to MinGW
Fixes bug #573595.
Diffstat (limited to 'sys/acmmp3dec')
| -rw-r--r-- | sys/acmmp3dec/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/acmmp3dec/acmmp3dec.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am index 1f143de09..c1a28e75f 100644 --- a/sys/acmmp3dec/Makefile.am +++ b/sys/acmmp3dec/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstacmmp3dec.la libgstacmmp3dec_la_SOURCES = acmmp3dec.c
libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS)
+ $(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS)
libgstacmmp3dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstriff-$(GST_MAJORMINOR) -lmsacm32
libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
diff --git a/sys/acmmp3dec/acmmp3dec.c b/sys/acmmp3dec/acmmp3dec.c index 9930e96d6..3a158f731 100644 --- a/sys/acmmp3dec/acmmp3dec.c +++ b/sys/acmmp3dec/acmmp3dec.c @@ -153,8 +153,9 @@ acmmp3dec_setup (ACMMP3Dec * dec) acmmp3dec_set_input_format (dec); acmmp3dec_set_output_format (dec); - res = acmStreamOpen (&dec->stream, NULL, &dec->infmt, &dec->outfmt, - 0, 0, 0, 0); + res = + acmStreamOpen (&dec->stream, NULL, (LPWAVEFORMATEX) & dec->infmt, + &dec->outfmt, 0, 0, 0, 0); if (res) { GST_WARNING_OBJECT (dec, "Failed to open ACM stream: %d", res); return FALSE; @@ -171,7 +172,7 @@ acmmp3dec_setup (ACMMP3Dec * dec) /* Ask what buffer size we need to use for our output */ acmStreamSize (dec->stream, ACM_BUFFER_SIZE, - &destBufferSize, ACM_STREAMSIZEF_SOURCE); + (LPDWORD) & destBufferSize, ACM_STREAMSIZEF_SOURCE); dec->header.pbDst = (BYTE *) g_malloc (destBufferSize); dec->header.cbDstLength = destBufferSize; @@ -404,7 +405,7 @@ acmmp3dec_class_init (ACMMP3DecClass * klass) } static void -acmmp3dec_base_init (ACMMP3DecClass * klass) +acmmp3dec_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); |