jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-v4l2: Fix build errors for older api 

Fix build errors for older versions of the api where
VIDIOC_ENUM_DV_TIMINGS was defined but V4L2_IN_CAP_DV_TIMINGS was not.
I was under the impression that they were added at the same time, but
apparently i was wrong there.

Thanks to kmoore@FreeBSD.org for spotting this on FreeBSD.
master
fryshorts 2015-05-02 15:05:38 +02:00
parent 65ccb2178e
commit 4497ab31c2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/linux-v4l2/v4l2-helpers.c
View File

@ -240,7 +240,7 @@ int_fast32_t v4l2_set_standard(int_fast32_t dev, int *standard)
int_fast32_t v4l2_enum_dv_timing(int_fast32_t dev, struct v4l2_dv_timings *dvt, int_fast32_t v4l2_enum_dv_timing(int_fast32_t dev, struct v4l2_dv_timings *dvt,
int index) int index)
{ {
#ifndef VIDIOC_ENUM_DV_TIMINGS #if !defined(VIDIOC_ENUM_DV_TIMINGS) || !defined(V4L2_IN_CAP_DV_TIMINGS)
UNUSED_PARAMETER(dev); UNUSED_PARAMETER(dev);
UNUSED_PARAMETER(dvt); UNUSED_PARAMETER(dvt);
UNUSED_PARAMETER(index); UNUSED_PARAMETER(index);

4
plugins/linux-v4l2/v4l2-input.c
View File

@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* The new dv timing api was introduced in Linux 3.4 /* The new dv timing api was introduced in Linux 3.4
* Currently we simply disable dv timings when this is not defined */ * Currently we simply disable dv timings when this is not defined */
#ifndef VIDIOC_ENUM_DV_TIMINGS #if !defined(VIDIOC_ENUM_DV_TIMINGS) || !defined(V4L2_IN_CAP_DV_TIMINGS)
#define V4L2_IN_CAP_DV_TIMINGS 0 #define V4L2_IN_CAP_DV_TIMINGS 0
#endif #endif
@ -949,7 +949,7 @@ static void *v4l2_create(obs_data_t *settings, obs_source_t *source)
#ifndef V4L2_CAP_DEVICE_CAPS #ifndef V4L2_CAP_DEVICE_CAPS
blog(LOG_WARNING, "Plugin built without device caps support!"); blog(LOG_WARNING, "Plugin built without device caps support!");
#endif #endif
#ifndef VIDIOC_ENUM_DV_TIMINGS #if !defined(VIDIOC_ENUM_DV_TIMINGS) || !defined(V4L2_IN_CAP_DV_TIMINGS)
blog(LOG_WARNING, "Plugin built without dv-timing support!"); blog(LOG_WARNING, "Plugin built without dv-timing support!");
#endif #endif