Skip to content

Commit 3fdd213

Browse files
author
Alexander Matveev
committed
8354336: gstclock.c: compilation error: 'incompatible pointer type' with gcc 14
Reviewed-by: kcr, arapte
1 parent 48240da commit 3fdd213

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gst_private.h

+4
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,11 @@ struct _GstDynamicTypeFactoryClass {
532532
struct _GstClockEntryImpl
533533
{
534534
GstClockEntry entry;
535+
#if defined (GSTREAMER_LITE) && defined(LINUX)
536+
GWeakRef clock;
537+
#else // GSTREAMER_LITE
535538
GWeakRef *clock;
539+
#endif // GSTREAMER_LITE
536540
GDestroyNotify destroy_entry;
537541
gpointer padding[21]; /* padding for allowing e.g. systemclock
538542
* to add data in lieu of overridable

modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -199,7 +199,7 @@ static void videodecoder_dispose(GObject* object)
199199
{
200200
VideoDecoder *decoder = VIDEODECODER(object);
201201

202-
basedecoder_close_decoder(decoder);
202+
basedecoder_close_decoder(BASEDECODER(decoder));
203203

204204
G_OBJECT_CLASS(parent_class)->dispose(object);
205205
}
@@ -545,7 +545,7 @@ static gboolean videodecoder_convert_frame(VideoDecoder *decoder)
545545
return FALSE;
546546

547547
int ret = decoder->sws_scale_func(decoder->sws_context,
548-
base->frame->data,
548+
(const uint8_t * const*)base->frame->data,
549549
base->frame->linesize,
550550
0,
551551
base->frame->height,

0 commit comments

Comments
 (0)