From: Ziqing Hui zhui@codeweavers.com
--- dlls/mf/tests/transform.c | 2 +- dlls/winegstreamer/video_decoder.c | 2 +- include/codecapi.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index b02c69b357e..7e2ccb6ea6e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4094,7 +4094,7 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_SA_D3D11_AWARE, 1), ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0), /* more H264 decoder specific attributes from CODECAPI */ - ATTR_UINT32(AVDecVideoAcceleration_H264, 1), + ATTR_UINT32(CODECAPI_AVDecVideoAcceleration_H264, 1), {0}, }; static const DWORD input_width = 120, input_height = 248; diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 53d9e00b137..891066dac3b 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1625,7 +1625,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), NULL, &decoder))) return hr;
- if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &CODECAPI_AVDecVideoAcceleration_H264, TRUE))) { IMFTransform_Release(&decoder->IMFTransform_iface); return hr; diff --git a/include/codecapi.h b/include/codecapi.h index 3df2bb09ce1..ed144fca914 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -85,7 +85,7 @@ enum eAVEncVideoOutputFrameRateConversion eAVEncVideoOutputFrameRateConversion_Alias = 2 };
-DEFINE_GUID(AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); +DEFINE_GUID(CODECAPI_AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2);
DEFINE_GUID(CODECAPI_AVEncCodecType, 0x08af4ac1, 0xf3f2, 0x4c74, 0x9d, 0xcf, 0x37, 0xf2, 0xec, 0x79, 0xf8, 0x26); DEFINE_GUID(CODECAPI_GUID_AVEncMPEG1Video, 0xc8dafefe, 0xda1e, 0x4774, 0xb2, 0x7d, 0x11, 0x83, 0x0c, 0x16, 0xb1, 0xfe);