[MPlayer-cvslog] r37793 - in trunk: configure stream/stream_pvr.c

[rtogni]

Author: rtogni
Date: Sun Feb 21 23:38:28 2016
New Revision: 37793

Log:
Permit compilation of strem_pvr on systems without v4l2_query_ext_ctrl qctrl

This is a more complete fix than r37779

Patch by Reza Arbab <arbab at panix.com>

Modified:
   trunk/configure
   trunk/stream/stream_pvr.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Feb 21 23:27:41 2016	(r37792)
+++ trunk/configure	Sun Feb 21 23:38:28 2016	(r37793)
@@ -7762,7 +7762,6 @@ if test "$_pvr" = auto && test "$_tv_v4l
 #include <linux/videodev2.h>
 int main(void) {
   struct v4l2_ext_controls ext;
-  struct v4l2_query_ext_ctrl qctrl;
   return ext.controls->value;
 }
 EOF

Modified: trunk/stream/stream_pvr.c
==============================================================================
--- trunk/stream/stream_pvr.c	Sun Feb 21 23:27:41 2016	(r37792)
+++ trunk/stream/stream_pvr.c	Sun Feb 21 23:38:28 2016	(r37793)
@@ -1096,6 +1096,7 @@ static void
 add_v4l2_ext_control (struct v4l2_ext_controls *ctrls, struct pvr_t *pvr,
                       uint32_t id, int32_t value)
 {
+#ifdef VIDIOC_QUERY_EXT_CTRL
   struct v4l2_query_ext_ctrl qctrl = { .id = id };
 
   /* add only if the device supports this control */
@@ -1120,6 +1121,7 @@ add_v4l2_ext_control (struct v4l2_ext_co
       return;
     }
   }
+#endif
 
   ctrls->controls[ctrls->count].id = id;
   ctrls->controls[ctrls->count].value = value;