[vlc-commits] Avoid obsolete V4L2_ENABLE_ENUM_FMT_EMULATION flag

Rémi Denis-Courmont git at videolan.org
Wed Aug 31 23:02:53 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 31 18:26:06 2011 +0300| [44ad0ad0aa4fe0c4fcb1dbc00559ddb1fcc0dc0a] | committer: Rémi Denis-Courmont

Avoid obsolete V4L2_ENABLE_ENUM_FMT_EMULATION flag

"libv4l *always* reports emulated formats to ENUM_FMT,
 except when conversion is disabled."

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=44ad0ad0aa4fe0c4fcb1dbc00559ddb1fcc0dc0a
---

 modules/access/v4l2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 2d393cd..fbb0288 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -1827,7 +1827,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
     if( p_sys->b_libv4l2 )
     {
         int libv4l2_fd;
-        libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION );
+        libv4l2_fd = v4l2_fd_open( i_fd, 0 );
         if( libv4l2_fd != -1 )
             i_fd = libv4l2_fd;
     }
@@ -2381,7 +2381,7 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
     if( p_sys->b_libv4l2 )
     {
         int libv4l2_fd;
-        libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION );
+        libv4l2_fd = v4l2_fd_open( i_fd, 0 );
         if( libv4l2_fd != -1 )
             i_fd = libv4l2_fd;
     }



More information about the vlc-commits mailing list