rpms/ffmpeg/devel ffmpeg-0.10.4-backport-libv4l2.patch, NONE, 1.1 ffmpeg.spec, 1.64, 1.65
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31460/devel
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-0.10.4-backport-libv4l2.patch
Log Message:
Fix libv4l
ffmpeg-0.10.4-backport-libv4l2.patch:
v4l2.c | 13 -------------
1 file changed, 13 deletions(-)
--- NEW FILE ffmpeg-0.10.4-backport-libv4l2.patch ---
X-Git-Url:
http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavdevice%2Fv4...
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 4829b1b..2808e13 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -156,9 +156,6 @@ static int device_open(AVFormatContext *ctx)
{
struct v4l2_capability cap;
int fd;
-#if CONFIG_LIBV4L2
- int fd_libv4l;
-#endif
int res, err;
int flags = O_RDWR;
@@ -175,16 +172,6 @@ static int device_open(AVFormatContext *ctx)
return AVERROR(err);
}
-#if CONFIG_LIBV4L2
- fd_libv4l = v4l2_fd_open(fd, 0);
- if (fd < 0) {
- err = AVERROR(errno);
- av_log(ctx, AV_LOG_ERROR, "Cannot open video device with libv4l neither %s :
%s\n",
- ctx->filename, strerror(errno));
- return err;
- }
- fd = fd_libv4l;
-#endif
res = v4l2_ioctl(fd, VIDIOC_QUERYCAP, &cap);
if (res < 0) {
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ffmpeg.spec 14 Jun 2012 17:21:18 -0000 1.64
+++ ffmpeg.spec 21 Jul 2012 09:32:36 -0000 1.65
@@ -12,7 +12,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.11.1
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -26,6 +26,7 @@
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
%endif
Source1: ffmpeg-snapshot-oldabi.sh
+Patch0: ffmpeg-0.10.4-backport-libv4l2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel
@@ -157,6 +158,7 @@
%else
%setup -q -n ffmpeg-%{version}
%endif
+%patch0 -p1
%build
mkdir generic
@@ -278,6 +280,9 @@
%changelog
+* Sat Jul 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.11.1-2
+- Backport fix rfbz#2423
+
* Thu Jun 14 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.11.1-1
- Updated to 0.11.1