diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-03-14 08:46:16 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-14 08:46:16 -0300 |
commit | 7a761ee7b29847cf1e441699dfae4ca56bb2fe66 (patch) | |
tree | 828fd16e93464435990c094265724e1ee6698bf8 /recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch | |
parent | efbd4d5aa45fa568b04f0948266e6b6d90f958c0 (diff) | |
parent | 19772e2ed81d2c7ace72e95cc7886e86ca94df42 (diff) | |
download | meta-freescale-7a761ee7b29847cf1e441699dfae4ca56bb2fe66.tar.gz |
Merge pull request #1456 from YoeDistro/yoe/mut
imx-gst1.0-plugin: Fix build with clang
Diffstat (limited to 'recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch new file mode 100644 index 00000000..567d1026 --- /dev/null +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 8a3d7f26c73bdfe050d3331b30ae2f5917dc6723 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 12 Mar 2023 19:59:22 -0700 | ||
4 | Subject: [PATCH 09/10] gstimxv4l2.c: Fix incompatible integer to pointer | ||
5 | conversion returning | ||
6 | |||
7 | Fixes | ||
8 | gstimxv4l2.c:1587:24: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-c | ||
9 | onversion] | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | libs/v4l2_core/gstimxv4l2.c | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c | ||
18 | index bf2620a..0fd7452 100755 | ||
19 | --- a/libs/v4l2_core/gstimxv4l2.c | ||
20 | +++ b/libs/v4l2_core/gstimxv4l2.c | ||
21 | @@ -1576,7 +1576,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk) | ||
22 | |||
23 | if (handle->allocated >= MAX_BUFFER) { | ||
24 | GST_ERROR ("No more v4l2 buffer for allocating.\n"); | ||
25 | - return -1; | ||
26 | + return NULL; | ||
27 | } | ||
28 | |||
29 | v4l2buf = &handle->buffer_pair[handle->allocated].v4l2buffer; | ||
30 | @@ -1584,7 +1584,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk) | ||
31 | v4l2buf->type = handle->type; | ||
32 | v4l2buf->memory = handle->memory_mode; | ||
33 | v4l2buf->index = handle->allocated; | ||
34 | - v4l2buf->m.userptr = memblk->paddr; | ||
35 | + v4l2buf->m.userptr = (unsigned long)memblk->paddr; | ||
36 | v4l2buf->length = memblk->size; | ||
37 | handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr; | ||
38 | |||
39 | -- | ||
40 | 2.39.2 | ||
41 | |||