[SCM] vlc/master: Remove un-needed patch

[edwardw-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cd540486df7648e420176c65db270c4b79e05a30
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Sun Oct 6 11:40:47 2013 -0400

    Remove un-needed patch
    
    Fixed in upstream, see http://git.videolan.org/?p=vlc.git;a=commitdiff;h=5d498a3966b84cd699b0e52d160fe6b2de293ef9

diff --git a/debian/patches/series b/debian/patches/series
index e5bcba8..5dbeb9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-v4l-kfreebsd.patch
 link-binaries-with-c++.patch
 dvbpsi.patch
 configure-m4-undefine.patch
diff --git a/debian/patches/v4l-kfreebsd.patch b/debian/patches/v4l-kfreebsd.patch
deleted file mode 100644
index e72ff45..0000000
--- a/debian/patches/v4l-kfreebsd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix v4l2 build failure on kfreebsd.
-Author: Benjamin Drung <bdrung at debian.org>
-Bug-Debian: http://bugs.debian.org/660935
-Bug: https://trac.videolan.org/vlc/ticket/6289
-
---- a/modules/access/v4l2/v4l2.h
-+++ b/modules/access/v4l2/v4l2.h
-@@ -39,6 +39,10 @@
- #  define V4L2_CTRL_TYPE_BITMASK 8
- # endif
- #endif
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+/* FreeBSD 10 and earlier does not have V4L2_CTRL_TYPE_BITMASK */
-+# define V4L2_CTRL_TYPE_BITMASK 8
-+#endif
- #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
- # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)
- # define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+37)

-- 
VLC media player packaging