- updated to version 4

Changed files:
    cinelerra-ffmpeg.patch -> 1.2
    cinelerra-system-libs.patch -> 1.12

diff --git a/cinelerra-ffmpeg.patch b/cinelerra-ffmpeg.patch
index fa59cd720d6f1df2657b0293d8ccd0c87f93c2b6..5e587ece73d8f1b17424518b31eeb36a8b5d1958 100644 (file)
--- a/cinelerra-ffmpeg.patch
+++ b/cinelerra-ffmpeg.patch
@@ -1,17 +1,17 @@
---- cinelerra-4/quicktime/mpeg4.c      2008-08-05 10:27:28.000000000 +0200
-+++ cinelerra-4-new/quicktime/mpeg4.c  2008-10-11 18:50:21.915259427 +0200
-@@ -671,7 +671,11 @@ static int encode(quicktime_t *file, uns
+--- cinelerra-4/quicktime/mpeg4.c~     2008-09-02 14:38:12.000000000 +0300
++++ cinelerra-4/quicktime/mpeg4.c      2009-07-07 11:53:27.567616978 +0300
+@@ -680,7 +680,11 @@
  
-               context->b_quant_factor = 1.25;
-               context->b_quant_offset = 1.25;
-+                #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-                       context->error_resilience = FF_ER_CAREFUL;
-+                #else
-+                      context->error_recognition = FF_ER_CAREFUL;
-+                #endif
-                       context->error_concealment = 3;
-                       context->frame_skip_cmp = FF_CMP_DCTMAX;
-                       context->ildct_cmp = FF_CMP_VSAD;
+ //            context->b_quant_factor = 1.25;
+ //            context->b_quant_offset = 1.25;
++//              #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ //                    context->error_resilience = FF_ER_CAREFUL;
++//              #else
++//                    context->error_recognition = FF_ER_CAREFUL;
++//              #endif
+ //                    context->error_concealment = 3;
+ //                    context->frame_skip_cmp = FF_CMP_DCTMAX;
+ //                    context->ildct_cmp = FF_CMP_VSAD;
 --- cinelerra-4/quicktime/wma.c        2007-01-09 08:09:49.000000000 +0100
 +++ cinelerra-4-new/quicktime/wma.c    2008-10-11 18:57:13.831898263 +0200
 @@ -187,11 +187,20 @@ printf("decode 2 %x %llx %llx\n", chunk_

diff --git a/cinelerra-system-libs.patch b/cinelerra-system-libs.patch
index f10ef9a8443e8d8ad8cdc0e782f06eefe4232e86..9c271a6eb4d33445e009297da2ba0ca41c85dfae 100644 (file)
--- a/cinelerra-system-libs.patch
+++ b/cinelerra-system-libs.patch
@@ -194,12 +194,12 @@
  
  $(OBJS):
        $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
---- cinelerra-4/plugins/titler/Makefile.orig   2008-07-14 04:27:17.000000000 +0200
-+++ cinelerra-4/plugins/titler/Makefile        2008-08-28 17:32:51.682116710 +0200
+--- cinelerra-4/plugins/titler/Makefile~       2008-09-02 14:38:09.000000000 +0300
++++ cinelerra-4/plugins/titler/Makefile        2009-07-07 11:50:40.564300866 +0300
 @@ -8,8 +8,8 @@
  
  
- OUTPUT = ../$(OBJDIR)/titler.plugin
+ OUTPUT = $(PLUGIN_DIR)/titler.plugin
 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../thirdparty/
 -LFLAGS += $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
 +CFLAGS += -I/usr/include/freetype2