Commit ab044d1b authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

winegstreamer: Use nameless unions.

parent 598a12a9
...@@ -3,7 +3,6 @@ IMPORTS = strmbase strmiids uuid ole32 mfuuid ...@@ -3,7 +3,6 @@ IMPORTS = strmbase strmiids uuid ole32 mfuuid
DELAYIMPORTS = mfplat DELAYIMPORTS = mfplat
EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRAINCL = $(GSTREAMER_CFLAGS)
EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WINE_NO_NAMELESS_EXTENSION
#include "gst_private.h" #include "gst_private.h"
#include "winternl.h" #include "winternl.h"
#include "rpcproxy.h" #include "rpcproxy.h"
......
...@@ -249,9 +249,9 @@ static void start_pipeline(struct media_source *source, struct source_async_comm ...@@ -249,9 +249,9 @@ static void start_pipeline(struct media_source *source, struct source_async_comm
if (source->state == SOURCE_STOPPED && position->vt == VT_EMPTY) if (source->state == SOURCE_STOPPED && position->vt == VT_EMPTY)
{ {
position->vt = VT_I8; position->vt = VT_I8;
position->u.hVal.QuadPart = 0; position->hVal.QuadPart = 0;
} }
source->start_time = position->u.hVal.QuadPart; source->start_time = position->hVal.QuadPart;
for (i = 0; i < source->stream_count; i++) for (i = 0; i < source->stream_count; i++)
{ {
...@@ -310,7 +310,7 @@ static void start_pipeline(struct media_source *source, struct source_async_comm ...@@ -310,7 +310,7 @@ static void start_pipeline(struct media_source *source, struct source_async_comm
source->state = SOURCE_RUNNING; source->state = SOURCE_RUNNING;
unix_funcs->wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, unix_funcs->wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0,
position->u.hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); position->hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning);
unix_funcs->wg_parser_end_flush(source->wg_parser); unix_funcs->wg_parser_end_flush(source->wg_parser);
} }
......
...@@ -336,10 +336,10 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * ...@@ -336,10 +336,10 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format *
if (format->u.video.format == WG_VIDEO_FORMAT_RGB16) if (format->u.video.format == WG_VIDEO_FORMAT_RGB16)
{ {
mt->cbFormat = offsetof(VIDEOINFO, u.dwBitMasks[3]); mt->cbFormat = offsetof(VIDEOINFO, dwBitMasks[3]);
video_format->u.dwBitMasks[iRED] = 0xf800; video_format->dwBitMasks[iRED] = 0xf800;
video_format->u.dwBitMasks[iGREEN] = 0x07e0; video_format->dwBitMasks[iGREEN] = 0x07e0;
video_format->u.dwBitMasks[iBLUE] = 0x001f; video_format->dwBitMasks[iBLUE] = 0x001f;
} }
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment