Author: fcrozat
Date: Tue Jan 23 15:57:59 2007
New Revision: 112478
Added:
packages/cooker/ffmpeg/current/SOURCES/ffmpeg-7407-fixdefine.patch
Modified:
packages/cooker/ffmpeg/current/SPECS/ffmpeg.spec
Log:
Patch1: fix wrong define in header
Added: packages/cooker/ffmpeg/current/SOURCES/ffmpeg-7407-fixdefine.patch
==============================================================================
--- (empty file)
+++ packages/cooker/ffmpeg/current/SOURCES/ffmpeg-7407-fixdefine.patch Tue Jan
23 15:57:59 2007
@@ -0,0 +1,11 @@
+--- ffmpeg/libavutil/common.h.fixdefine 2007-01-23 15:43:49.000000000
+0100
++++ ffmpeg/libavutil/common.h 2007-01-23 15:43:58.000000000 +0100
+@@ -120,7 +120,7 @@
+ /* median of 3 */
+ static inline int mid_pred(int a, int b, int c)
+ {
+-#if HAVE_CMOV
++#ifdef HAVE_CMOV
+ int i=b;
+ asm volatile(
+ "cmp %2, %1 \n\t"
Modified: packages/cooker/ffmpeg/current/SPECS/ffmpeg.spec
==============================================================================
--- packages/cooker/ffmpeg/current/SPECS/ffmpeg.spec (original)
+++ packages/cooker/ffmpeg/current/SPECS/ffmpeg.spec Tue Jan 23 15:57:59 2007
@@ -2,7 +2,7 @@
%define version 0.4.9
%define svn 7407
%define pre pre1.%svn
-%define rel 6
+%define rel 7
%define release %mkrel 3.%pre.%rel
%define major 51
%define amrver 540
@@ -26,6 +26,7 @@
Source0: %{name}-%{svn}.tar.bz2
Source1:
http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-%{amrver}.zip
Patch1: ffmpeg-ffplay-uses-xlib.patch
+Patch2: ffmpeg-7407-fixdefine.patch
License: GPL
Group: Video
BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -119,6 +120,7 @@
%setup -q -n %{name} -a 1
%patch1 -p1 -b .ffplay-uses-xlib
+%patch2 -p1 -b .fixdefine
%if %build_plf
unzip -qq 26104-%{amrver}_ANSI_C_source_code.zip
mv c-code libavcodec/amr_float
