Author: kwizart Update of /cvs/free/rpms/ffmpeg/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28923/F-17 Modified Files: ffmpeg.spec Added Files: ffmpeg-0.10.4-backport-libv4l2.patch Log Message: Backport patch for libv4l2 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/F-17/ffmpeg.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ffmpeg.spec 13 Jun 2012 07:24:27 -0000 1.63 +++ ffmpeg.spec 20 Jul 2012 19:51:20 -0000 1.64 @@ -12,7 +12,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.10.4 -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 +* Fri Jul 20 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.10.4-2 +- Backport fix rfbz#2423 + * Wed Jun 13 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.10.4-1 - Updated to 0.10.4