From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hihin@yandex.ru>
From: =?windows-1251?b?1ej16O0g0PPx6+Dt?= <hihin@yandex.ru>
To: sisyphus@lists.altlinux.org
Date: Tue, 25 Jul 2006 12:38:17 +0400
User-Agent: KMail/1.9.3
References: <200607190402.34397@ruslandh> <200607241227.04779@ruslandh>
	<200607251102.12274@ruslandh>
In-Reply-To: <200607251102.12274@ruslandh>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart1242775.3VWMbEVGTB";
	protocol="application/pgp-signature"; micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <200607251238.23391@ruslandh>
Subject: Re: [sisyphus] XawTV4
X-BeenThere: sisyphus@lists.altlinux.org
X-Mailman-Version: 2.1.7
Precedence: list
Reply-To: hihin@yandex.ru,
	ALT Linux Sisyphus discussion list <sisyphus@lists.altlinux.org>
List-Id: ALT Linux Sisyphus discussion list <sisyphus.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/sisyphus>
List-Post: <mailto:sisyphus@lists.altlinux.org>
List-Help: <mailto:sisyphus-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jul 2006 08:39:25 -0000
Archived-At: <http://lore.altlinux.org/sisyphus/200607251238.23391@ruslandh/>
List-Archive: <http://lore.altlinux.org/sisyphus/>
List-Post: <mailto:sisyphus@altlinux.ru>

--nextPart1242775.3VWMbEVGTB
Content-Type: multipart/mixed;
  boundary="Boundary-01=_5hdxEv4PvQ3WVwC"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_5hdxEv4PvQ3WVwC
Content-Type: text/plain;
  charset="windows-1251"
Content-Transfer-Encoding: base64
Content-Disposition: inline

x+Tw4OLx8uLz6fLlIEFsbAogIMIg8e7u4fnl7ejoIO7yIDI1IOj+6/8gMjAwNiAxMTowMiDV6PXo
7SDQ8/Hr4O0g7eDv6PHg6yhhKToKCsjn4ujt6PLlLCDt5SDy7vIg9ODp6yDi6+7m6OsuCgotLSAK
0SAg8+Lg5uXt6OXsINXo9ejtINDz8evg7Qo=

--Boundary-01=_5hdxEv4PvQ3WVwC
Content-Type: text/x-diff; charset="windows-1251";
	name="xawtv4-20060615-libquictime-fix.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="xawtv4-20060615-libquictime-fix.patch"

diff -uNr xawtv/libng/plugins/read-mpeg.c xawtv-new/libng/plugins/read-mpeg=
=2Ec
=2D-- 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 =3D h->ts.size-off;
 	if (buf->size + size > TS_AUDIO_BUF) {
 	    fprintf(stderr,"ts: TS_AUDIO_BUF too small (%ld > %d)\n",
=2D		    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
=2D-- 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>
=2D#include <quicktime/quicktime.h>
=2D#include <quicktime/colormodels.h>
=2D#include <quicktime/lqt.h>
+#include <lqt/quicktime.h>
+#include <lqt/colormodels.h>
+#include <lqt/lqt.h>
=20
 #include "grab-ng.h"
=20
diff -uNr xawtv/libng/plugins/write-qt.c xawtv-new/libng/plugins/write-qt.c
=2D-- 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>
=2D#include <quicktime/quicktime.h>
=2D#include <quicktime/colormodels.h>
=2D#include <quicktime/lqt.h>
+#include <lqt/quicktime.h>
+#include <lqt/colormodels.h>
+#include <lqt/lqt.h>
=20
 #include "grab-ng.h"
=20
@@ -336,6 +336,7 @@
     int i,j,k,skip,fmtid;
     unsigned int cmodel;
     struct qt_video_priv *vp;
+    int model=3D0;
=20
     /* handle video encoders */
     video =3D malloc(sizeof(qt_vformats));
@@ -348,10 +349,12 @@
 		    info[i]->name,info[i]->long_name);
 	    for (j =3D 0; j < info[i]->num_fourccs; j++)
 		fprintf(stderr,"   fcc   : %s\n",info[i]->fourccs[j]);
=2D	    for (j =3D 0; j < info[i]->num_encoding_colormodels; j++)
=2D		fprintf(stderr,"   cmodel: %d [%s]\n",
=2D			info[i]->encoding_colormodels[j],
=2D			lqt_get_colormodel_string(info[i]->encoding_colormodels[j]));
+	    for (j =3D 0;  j < lqt_num_colormodels(); j++)
+	        {
+	        model=3Dlqt_get_colormodel(j);   =20
+		fprintf(stderr,"   cmodel: %d [%s]\n", model,=20
+		    lqt_get_colormodel_string(model) );
+		}
 	}
=20
 	/* sanity checks */
@@ -378,8 +381,8 @@
 	/* pick colormodel */
 	fmtid  =3D VIDEO_NONE;
 	cmodel =3D 0;
=2D	for (j =3D 0; j < info[i]->num_encoding_colormodels; j++) {
=2D	    cmodel =3D info[i]->encoding_colormodels[j];
+	for (j =3D 0; j < lqt_num_colormodels(); j++) {
+	    cmodel =3D lqt_get_colormodel(j);
 	    if (cmodel>=3D sizeof(cmodels)/sizeof(int))
 		continue;
 	    if (!cmodels[cmodel])

--Boundary-01=_5hdxEv4PvQ3WVwC--

--nextPart1242775.3VWMbEVGTB
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)

iD8DBQBExdh/gDaarYH/1aQRAv+BAJ4lm4WMOAeTWD+yxzvzYzAWjCeTzwCfSnUZ
FhqbbipLaTltt6OxaLUtZvI=
=tl9o
-----END PGP SIGNATURE-----

--nextPart1242775.3VWMbEVGTB--