Paul Gofman : winegstreamer: Route MFAudioFormat_RAW_AAC to mf_media_type_to_wg_format_audio_mpeg4().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 98fb788212d499ec01495f3aadf7fb2e759d9491
URL:    https://gitlab.winehq.org/wine/wine/-/commit/98fb788212d499ec01495f3aadf7fb2...

Author: Paul Gofman 
Date:   Tue Jan  3 18:48:03 2023 -0600

winegstreamer: Route MFAudioFormat_RAW_AAC to mf_media_type_to_wg_format_audio_mpeg4().

---

dlls/winegstreamer/aac_decoder.c | 2 --
 dlls/winegstreamer/gst_private.h | 2 ++
 dlls/winegstreamer/mfplat.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c
index 8366ac7bb36..d79ede69c9d 100644
--- a/dlls/winegstreamer/aac_decoder.c
+++ b/dlls/winegstreamer/aac_decoder.c
@@ -30,8 +30,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);

-extern const GUID MFAudioFormat_RAW_AAC;
-
 static struct
 {
     const GUID *const guid;
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 1e4aad32f44..5b4c01a3cd0 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -148,4 +148,6 @@ HRESULT aac_decoder_create(REFIID riid, void **ret);
 HRESULT h264_decoder_create(REFIID riid, void **ret);
 HRESULT video_processor_create(REFIID riid, void **ret);

+extern const GUID MFAudioFormat_RAW_AAC;
+
 #endif /* __GST_PRIVATE_INCLUDED__ */
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 34731a23e1e..032d352b7cc 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -863,7 +863,7 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
                 IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) ||
                 IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))
             mf_media_type_to_wg_format_audio_wma(type, &subtype, format);
-        else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC))
+        else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC) || IsEqualGUID(&subtype, &MFAudioFormat_RAW_AAC))
             mf_media_type_to_wg_format_audio_mpeg4(type, format);
         else
             mf_media_type_to_wg_format_audio(type, &subtype, format);