[-]
[+]
|
Changed |
x264.spec
|
|
[-]
[+]
|
Changed |
x264-rewrite-ffmpeg-defaults.patch
^
|
@@ -1,12 +1,15 @@
-diff -ur x264-snapshot-20091211-2245.orig/encoder/encoder.c x264-snapshot-20091211-2245/encoder/encoder.c
---- x264-snapshot-20091211-2245.orig/encoder/encoder.c 2009-12-11 12:32:20.000000000 +0100
-+++ x264-snapshot-20091211-2245/encoder/encoder.c 2009-12-15 22:49:49.452559815 +0100
-@@ -454,9 +454,8 @@
+diff -ur x264-snapshot-20110225-2245.orig/encoder/encoder.c x264-snapshot-20110225-2245/encoder/encoder.c
+--- x264-snapshot-20110225-2245.orig/encoder/encoder.c 2011-02-25 22:45:04.000000000 +0100
++++ x264-snapshot-20110225-2245/encoder/encoder.c 2011-02-26 14:24:02.144281162 +0100
+@@ -487,12 +487,8 @@
score += h->param.analyse.inter == 0 && h->param.analyse.i_subpel_refine == 8;
if( score >= 5 )
{
- x264_log( h, X264_LOG_ERROR, "broken ffmpeg default settings detected\n" );
-- x264_log( h, X264_LOG_ERROR, "use an encoding preset (vpre)\n" );
+- x264_log( h, X264_LOG_ERROR, "use an encoding preset (e.g. -vpre medium)\n" );
+- x264_log( h, X264_LOG_ERROR, "preset usage: -vpre <speed> -vpre <profile>\n" );
+- x264_log( h, X264_LOG_ERROR, "speed presets are listed in x264 --help\n" );
+- x264_log( h, X264_LOG_ERROR, "profile is optional; x264 defaults to high\n" );
- return -1;
+ /* broken ffmpeg defaults, set to h264 defaults */
+ x264_param_default( &h->param );
|
[-]
[+]
|
Changed |
x264-use-shared-library.patch
^
|
@@ -1,7 +1,7 @@
-diff -ur x264-snapshot-20101002-2245.orig/Makefile x264-snapshot-20101002-2245/Makefile
---- x264-snapshot-20101002-2245.orig/Makefile 2010-10-02 22:45:07.000000000 +0200
-+++ x264-snapshot-20101002-2245/Makefile 2010-10-03 13:42:33.072481891 +0200
-@@ -134,9 +134,10 @@
+diff -ur x264-snapshot-20110225-2245.orig/Makefile x264-snapshot-20110225-2245/Makefile
+--- x264-snapshot-20110225-2245.orig/Makefile 2011-02-25 22:45:04.000000000 +0100
++++ x264-snapshot-20110225-2245/Makefile 2011-02-26 14:25:51.568295374 +0100
+@@ -145,9 +145,10 @@
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
@@ -14,10 +14,10 @@
checkasm: tools/checkasm.o libx264.a
$(CC) -o $@ $+ $(LDFLAGS)
-@@ -207,10 +208,12 @@
- install -d $(DESTDIR)$(libdir)
+@@ -219,10 +220,12 @@
install -d $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
+ install -m 644 x264_config.h $(DESTDIR)$(includedir)
- install -m 644 libx264.a $(DESTDIR)$(libdir)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
install x264$(EXE) $(DESTDIR)$(bindir)
|
|
Changed |
x264-snapshot-20110225-2245.tar.bz2
^
|