[-]
[+]
|
Changed |
ffmpeg.spec
|
|
[-]
[+]
|
Changed |
ffmpeg_configure.diff
^
|
@@ -1,6 +1,6 @@
---- configure.orig 2010-09-28 23:31:55.000000000 +0200
-+++ configure 2010-10-03 17:37:20.605547484 +0200
-@@ -2640,11 +2640,11 @@
+--- configure.orig 2011-02-28 20:16:15.000000000 +0100
++++ configure 2011-03-09 20:58:42.286516569 +0100
+@@ -2693,11 +2693,11 @@
$nogas "GNU assembler not found, install gas-preprocessor"
fi
@@ -14,9 +14,9 @@
-fi
+#fi
- # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
- check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
-@@ -3309,7 +3309,7 @@
+ if enabled network; then
+ check_type "sys/types.h sys/socket.h" socklen_t
+@@ -3370,7 +3370,7 @@
Conflicts:
Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
Libs.private: $(enabled shared && echo $libs)
@@ -25,7 +25,7 @@
EOF
cat <<EOF > $name/$name-uninstalled.pc
prefix=
-@@ -3323,7 +3323,7 @@
+@@ -3384,7 +3384,7 @@
Requires: $requires
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
|
[-]
[+]
|
Changed |
ffmpeg_fix_return.diff
^
|
@@ -1,6 +1,6 @@
diff -ur ffmpeg.orig/libswscale/x86/yuv2rgb_template.c ffmpeg/libswscale/x86/yuv2rgb_template.c
---- ffmpeg.orig/libswscale/x86/yuv2rgb_template.c 2010-05-30 18:50:31.000000000 +0200
-+++ ffmpeg/libswscale/x86/yuv2rgb_template.c 2010-10-03 14:02:16.226730841 +0200
+--- ffmpeg.orig/libswscale/x86/yuv2rgb_template.c 2011-01-23 22:13:55.000000000 +0100
++++ ffmpeg/libswscale/x86/yuv2rgb_template.c 2011-03-09 20:56:00.394764911 +0100
@@ -407,6 +407,7 @@
YUV2RGB_OPERANDS_ALPHA
YUV2RGB_ENDFUNC
|
|
Added |
ffmpeg-0.6.201103092102git.tar.bz2
^
|
|
Deleted |
ffmpeg-0.6.25702svn.tar.bz2
^
|
[-]
[+]
|
Deleted |
ffmpeg-rpmlintrc
^
|
@@ -1 +0,0 @@
-addFilter("shlib-fixed-dependency")
|