Re: [sisyphus] XawTV4

["Хихин Руслан" <hihin@yandex.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 140 bytes --]

Здравствуйте All
  В сообщении от 25 июля 2006 11:02 Хихин Руслан написал(a):

Извините, не тот файл вложил.

-- 
С  уважением Хихин Руслан

[-- Attachment #1.2: xawtv4-20060615-libquictime-fix.patch --]
[-- Type: text/x-diff, Size: 2732 bytes --]

diff -uNr xawtv/libng/plugins/read-mpeg.c xawtv-new/libng/plugins/read-mpeg.c
--- xawtv/libng/plugins/read-mpeg.c	2005-10-08 18:13:11 +0400
+++ xawtv-new/libng/plugins/read-mpeg.c	2006-07-25 12:21:08 +0400
@@ -768,7 +768,7 @@
 	size = h->ts.size-off;
 	if (buf->size + size > TS_AUDIO_BUF) {
 	    fprintf(stderr,"ts: TS_AUDIO_BUF too small (%ld > %d)\n",
-		    buf->size + size, TS_AUDIO_BUF);
+		    (long int) buf->size + size, TS_AUDIO_BUF);
 	    exit(1);
 	}
 	memcpy(buf->data + buf->size, data, size);
diff -uNr xawtv/libng/plugins/read-qt.c xawtv-new/libng/plugins/read-qt.c
--- xawtv/libng/plugins/read-qt.c	2004-02-24 23:09:16 +0300
+++ xawtv-new/libng/plugins/read-qt.c	2006-07-25 12:03:19 +0400
@@ -4,9 +4,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <pthread.h>
-#include <quicktime/quicktime.h>
-#include <quicktime/colormodels.h>
-#include <quicktime/lqt.h>
+#include <lqt/quicktime.h>
+#include <lqt/colormodels.h>
+#include <lqt/lqt.h>
 
 #include "grab-ng.h"
 
diff -uNr xawtv/libng/plugins/write-qt.c xawtv-new/libng/plugins/write-qt.c
--- xawtv/libng/plugins/write-qt.c	2004-02-24 23:09:16 +0300
+++ xawtv-new/libng/plugins/write-qt.c	2006-07-25 12:30:43 +0400
@@ -4,9 +4,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <pthread.h>
-#include <quicktime/quicktime.h>
-#include <quicktime/colormodels.h>
-#include <quicktime/lqt.h>
+#include <lqt/quicktime.h>
+#include <lqt/colormodels.h>
+#include <lqt/lqt.h>
 
 #include "grab-ng.h"
 
@@ -336,6 +336,7 @@
     int i,j,k,skip,fmtid;
     unsigned int cmodel;
     struct qt_video_priv *vp;
+    int model=0;
 
     /* handle video encoders */
     video = malloc(sizeof(qt_vformats));
@@ -348,10 +349,12 @@
 		    info[i]->name,info[i]->long_name);
 	    for (j = 0; j < info[i]->num_fourccs; j++)
 		fprintf(stderr,"   fcc   : %s\n",info[i]->fourccs[j]);
-	    for (j = 0; j < info[i]->num_encoding_colormodels; j++)
-		fprintf(stderr,"   cmodel: %d [%s]\n",
-			info[i]->encoding_colormodels[j],
-			lqt_get_colormodel_string(info[i]->encoding_colormodels[j]));
+	    for (j = 0;  j < lqt_num_colormodels(); j++)
+	        {
+	        model=lqt_get_colormodel(j);    
+		fprintf(stderr,"   cmodel: %d [%s]\n", model, 
+		    lqt_get_colormodel_string(model) );
+		}
 	}
 
 	/* sanity checks */
@@ -378,8 +381,8 @@
 	/* pick colormodel */
 	fmtid  = VIDEO_NONE;
 	cmodel = 0;
-	for (j = 0; j < info[i]->num_encoding_colormodels; j++) {
-	    cmodel = info[i]->encoding_colormodels[j];
+	for (j = 0; j < lqt_num_colormodels(); j++) {
+	    cmodel = lqt_get_colormodel(j);
 	    if (cmodel>= sizeof(cmodels)/sizeof(int))
 		continue;
 	    if (!cmodels[cmodel])

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]