Annotation of /trunk/gst-plugins-good/patches/gst-plugins-good-0.10.31-compile-fixes.patch
Parent Directory | Revision Log
Revision 2332 -
(hide annotations)
(download)
Thu Dec 5 12:06:08 2013 UTC (10 years, 9 months ago) by niro
File size: 1184 byte(s)
Thu Dec 5 12:06:08 2013 UTC (10 years, 9 months ago) by niro
File size: 1184 byte(s)
-more compile fixes
1 | niro | 2332 | From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Walters <walters@verbum.org> | ||
3 | Date: Thu, 2 May 2013 16:16:46 -0400 | ||
4 | Subject: [PATCH] sys/v4l2: Some blind compilation fixes | ||
5 | |||
6 | --- | ||
7 | sys/v4l2/gstv4l2bufferpool.c | 1 - | ||
8 | sys/v4l2/v4l2_calls.c | 12 ++++-------- | ||
9 | 2 files changed, 4 insertions(+), 9 deletions(-) | ||
10 | |||
11 | diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c | ||
12 | index 309bfb6..ee3ff9f 100644 | ||
13 | --- a/sys/v4l2/v4l2_calls.c | ||
14 | +++ b/sys/v4l2/v4l2_calls.c | ||
15 | @@ -53,14 +53,6 @@ | ||
16 | |||
17 | #include "gst/gst-i18n-plugin.h" | ||
18 | |||
19 | -/* Those are ioctl calls */ | ||
20 | -#ifndef V4L2_CID_HCENTER | ||
21 | -#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED | ||
22 | -#endif | ||
23 | -#ifndef V4L2_CID_VCENTER | ||
24 | -#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED | ||
25 | -#endif | ||
26 | - | ||
27 | GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); | ||
28 | #define GST_CAT_DEFAULT v4l2_debug | ||
29 | |||
30 | @@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) | ||
31 | break; | ||
32 | case V4L2_CID_HFLIP: | ||
33 | case V4L2_CID_VFLIP: | ||
34 | +#ifdef V4L2_CID_HCENTER | ||
35 | case V4L2_CID_HCENTER: | ||
36 | +#endif | ||
37 | +#ifdef V4L2_CID_VCENTER | ||
38 | case V4L2_CID_VCENTER: | ||
39 | +#endif | ||
40 | #ifdef V4L2_CID_PAN_RESET | ||
41 | case V4L2_CID_PAN_RESET: | ||
42 | #endif | ||
43 | -- | ||
44 | 1.7.1 | ||
45 |