el8
Nicolas Chauvet 12 years ago
parent befc0ea56f
commit 82fabe3151

@ -0,0 +1,33 @@
X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavdevice%2Fv4l2.c;h=2808e13ac3fa143a41f8a56877aaffc82344a0b5;hp=4829b1b694902235b4c06308a4e0dda7aa0dc52c;hb=fd58678b86023ea98665f06756bf03f91e56be54;hpb=b040ffc84c5e35436590e0bcea6608a2ad31cf84
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) {

@ -12,7 +12,7 @@
Summary: Digital VCR and streaming server Summary: Digital VCR and streaming server
Name: ffmpeg Name: ffmpeg
Version: 0.11.1 Version: 0.11.1
Release: 1%{?date}%{?date:git}%{?rel}%{?dist} Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1} %if 0%{?_with_amr:1}
License: GPLv3+ License: GPLv3+
%else %else
@ -26,6 +26,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2 Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
%endif %endif
Source1: ffmpeg-snapshot-oldabi.sh Source1: ffmpeg-snapshot-oldabi.sh
Patch0: ffmpeg-0.10.4-backport-libv4l2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
@ -157,6 +158,7 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else %else
%setup -q -n ffmpeg-%{version} %setup -q -n ffmpeg-%{version}
%endif %endif
%patch0 -p1
%build %build
mkdir generic mkdir generic
@ -278,6 +280,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Jul 21 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.11.1-2
- Backport fix rfbz#2423
* Thu Jun 14 2012 Julian Sikorski <belegdol@fedoraproject.org> - 0.11.1-1 * Thu Jun 14 2012 Julian Sikorski <belegdol@fedoraproject.org> - 0.11.1-1
- Updated to 0.11.1 - Updated to 0.11.1

Loading…
Cancel
Save