access/stream_filter: add libarchive

[vlc] / modules / access / v4l2 / access.c

diff --git a/modules/access/v4l2/access.c b/modules/access/v4l2/access.c
index fe3a591717ad89b4e9ef18422ac8acdd58ba5a01..30dc7e98835a95832cb152e3f71fc4b078662f29 100644 (file)
--- a/modules/access/v4l2/access.c
+++ b/modules/access/v4l2/access.c
@@ -103,7 +103,8 @@ int InitVideo (access_t *access, int fd, uint32_t caps)
         return -1;
     }
 
-    if (SetupInput (VLC_OBJECT(access), fd))
+    v4l2_std_id std;
+    if (SetupInput (VLC_OBJECT(access), fd, &std))
         return -1;
 
     /* NOTE: The V4L access_demux expects a VLC FOURCC as "chroma". It is used to set the
@@ -122,7 +123,8 @@ int InitVideo (access_t *access, int fd, uint32_t caps)
         struct v4l2_format fmt = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE };
         if (v4l2_ioctl (fd, VIDIOC_G_FMT, &fmt) < 0)
         {
-            msg_Err (access, "cannot get default format: %m");
+            msg_Err (access, "cannot get default format: %s",
+                     vlc_strerror_c(errno));
             return -1;
         }
         pixfmt = fmt.fmt.pix.pixelformat;
@@ -209,7 +211,7 @@ static int AccessPoll (access_t *access)
         case 0:
             /* FIXME: kill this case (arbitrary timeout) */
                 return -1;
-            msg_Err (access, "poll error: %m");
+            msg_Err (access, "poll error: %s", vlc_strerror_c(errno));
             access->info.b_eof = true;
             return -1;
     }
@@ -248,7 +250,7 @@ static block_t *ReadBlock (access_t *access)
     if (val < 0)
     {
         block_Release (block);
-        msg_Err (access, "cannot read buffer: %m");
+        msg_Err (access, "cannot read buffer: %s", vlc_strerror_c(errno));
         access->info.b_eof = true;
         return NULL;
     }
@@ -262,7 +264,6 @@ static int AccessControl( access_t *access, int query, va_list args )
 {
     switch( query )
     {
-        /* */
         case ACCESS_CAN_SEEK:
         case ACCESS_CAN_FASTSEEK:
         case ACCESS_CAN_PAUSE:
@@ -270,27 +271,16 @@ static int AccessControl( access_t *access, int query, va_list args )
             *va_arg( args, bool* ) = false;
             break;
 
-        /* */
         case ACCESS_GET_PTS_DELAY:
             *va_arg(args,int64_t *) = INT64_C(1000)
                 * var_InheritInteger( access, "live-caching" );
             break;
 
-        /* */
         case ACCESS_SET_PAUSE_STATE:
             /* Nothing to do */
             break;
 
-        case ACCESS_GET_TITLE_INFO:
-        case ACCESS_SET_TITLE:
-        case ACCESS_SET_SEEKPOINT:
-        case ACCESS_SET_PRIVATE_ID_STATE:
-        case ACCESS_GET_CONTENT_TYPE:
-        case ACCESS_GET_META:
-            return VLC_EGENERIC;
-
         default:
-            msg_Warn( access, "Unimplemented query %d in control", query );
             return VLC_EGENERIC;
 
     }