rpms/ffmpeg-compat/devel ffmpeg-0.6.6-compile-fix.patch, NONE, 1.1 ffmpeg-compat.spec, 1.7, 1.8
Author: jwrdegoede
Update of /cvs/free/rpms/ffmpeg-compat/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8786
Modified Files:
ffmpeg-compat.spec
Added Files:
ffmpeg-0.6.6-compile-fix.patch
Log Message:
* Sun May 5 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.6.6-6
- Rebuilt for x264 0.130
ffmpeg-0.6.6-compile-fix.patch:
vaapi_mpeg4.c | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE ffmpeg-0.6.6-compile-fix.patch ---
diff -up ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c~ ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c
--- ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c~ 2012-06-09 22:09:09.000000000 +0200
+++ ffmpeg-0.6.6/libavcodec/vaapi_mpeg4.c 2013-05-05 20:34:05.537171756 +0200
@@ -21,6 +21,7 @@
*/
#include "vaapi_internal.h"
+#include "h263.h"
/** Reconstruct bitstream intra_dc_vlc_thr */
static int mpeg4_get_intra_dc_vlc_thr(MpegEncContext *s)
Index: ffmpeg-compat.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/devel/ffmpeg-compat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ffmpeg-compat.spec 20 Jan 2013 22:08:06 -0000 1.7
+++ ffmpeg-compat.spec 5 May 2013 18:33:34 -0000 1.8
@@ -10,7 +10,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg-compat
Version: 0.6.6
-Release: 5%{?dist}
+Release: 6%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -20,6 +20,7 @@
URL: http://ffmpeg.org/
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
Source1: ffmpeg-snapshot.sh
+Patch0: ffmpeg-0.6.6-compile-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
@@ -113,6 +114,7 @@
%prep
%setup -q -n ffmpeg-%{version}
+%patch0 -p1
%build
mkdir generic
@@ -226,6 +228,9 @@
%changelog
+* Sun May 5 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.6.6-6
+- Rebuilt for x264 0.130
+
* Sun Jan 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.6-5
- Rebuilt for FFmpeg/x264