* Thu Oct 04 2012 Julian Sikorski <belegdol@fedoraproject.org> - 1.0-1

- Updated to 1.0
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Dropped the included patch
el8
Julian Sikorski 12 years ago
parent 93c2ff66a8
commit 309f53a1fe

2
.gitignore vendored

@ -1 +1 @@
ffmpeg-0.11.1.tar.bz2 ffmpeg-1.0.tar.bz2

@ -1,33 +0,0 @@
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) {

@ -11,14 +11,13 @@
Summary: Digital VCR and streaming server Summary: Digital VCR and streaming server
Name: ffmpeg Name: ffmpeg
Version: 0.11.1 Version: 1.0
Release: 3%{?date}%{?date:git}%{?rel}%{?dist} Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1} %if 0%{?_with_amr:1}
License: GPLv3+ License: GPLv3+
%else %else
License: GPLv2+ License: GPLv2+
%endif %endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/ URL: http://ffmpeg.org/
%if 0%{?date} %if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2 Source0: ffmpeg-%{?branch}%{date}.tar.bz2
@ -26,8 +25,6 @@ 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)
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
%{!?_without_celt:BuildRequires: celt-devel} %{!?_without_celt:BuildRequires: celt-devel}
@ -80,7 +77,6 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs %package libs
Summary: Libraries for %{name} Summary: Libraries for %{name}
Group: System Environment/Libraries
%description libs %description libs
FFmpeg is a complete and free Internet live audio and video FFmpeg is a complete and free Internet live audio and video
@ -91,7 +87,6 @@ This package contains the libraries for %{name}
%package devel %package devel
Summary: Development package for %{name} Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name}-libs%{_isa} = %{version}-%{release} Requires: %{name}-libs%{_isa} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
@ -158,7 +153,6 @@ 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
@ -233,9 +227,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
popd popd
%endif %endif
%clean
rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
@ -243,7 +234,6 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{!?ffmpegsuffix:1} %if 0%{!?ffmpegsuffix:1}
%files %files
%defattr(-,root,root,-)
%doc COPYING.* CREDITS README doc/ffserver.conf %doc COPYING.* CREDITS README doc/ffserver.conf
%{_bindir}/ffmpeg %{_bindir}/ffmpeg
%{_bindir}/ffplay %{_bindir}/ffplay
@ -258,7 +248,6 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%files libs %files libs
%defattr(-,root,root,-)
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%if 0%{!?ffmpegsuffix:1} %if 0%{!?ffmpegsuffix:1}
%ifarch sparc sparc64 %ifarch sparc sparc64
@ -267,7 +256,6 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%files devel %files devel
%defattr(-,root,root,-)
%doc MAINTAINERS doc/APIchanges doc/*.txt %doc MAINTAINERS doc/APIchanges doc/*.txt
%{_includedir}/ffmpeg %{_includedir}/ffmpeg
%{_libdir}/pkgconfig/lib*.pc %{_libdir}/pkgconfig/lib*.pc
@ -280,6 +268,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Oct 04 2012 Julian Sikorski <belegdol@fedoraproject.org> - 1.0-1
- Updated to 1.0
- Dropped obsolete Group, Buildroot, %%clean and %%defattr
- Dropped the included patch
* Wed Sep 05 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.11.1-3 * Wed Sep 05 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.11.1-3
- Rebuilt for x264 ABI 125 - Rebuilt for x264 ABI 125

@ -1 +1 @@
ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2 3ed526cea20c1bffb5a37f7730f710bd ffmpeg-1.0.tar.bz2

Loading…
Cancel
Save