From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: =?windows-1251?b?1ej16O0g0PPx6+Dt?= To: sisyphus@lists.altlinux.org Date: Tue, 25 Jul 2006 11:02:05 +0400 User-Agent: KMail/1.9.3 References: <200607190402.34397@ruslandh> <679044850607240036l7bb2e98ftae01e39d7ee823b9@mail.gmail.com> <200607241227.04779@ruslandh> In-Reply-To: <200607241227.04779@ruslandh> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2442947.zVoYQKSxVO"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200607251102.12274@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 List-Id: ALT Linux Sisyphus discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2006 07:03:24 -0000 Archived-At: List-Archive: List-Post: --nextPart2442947.zVoYQKSxVO Content-Type: multipart/mixed; boundary="Boundary-01=_uHcxE8ealiLuRAV" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_uHcxE8ealiLuRAV Content-Type: text/plain; charset="windows-1251" Content-Transfer-Encoding: base64 Content-Disposition: inline x+Tw4OLx8uLz6fLlINXo9ejtINDz8evg7QogIMIg8e7u4fnl7ejoIO7yIDI0IOj+6/8gMjAwNiAx MjoyNiDV6PXo7SDQ8/Hr4O0g7eDv6PHg6yhhKToK0eTl6+DrIO3l8eru6/zq7iDv4PL35ekg5Ov/ IFhhd1RWCs7k6O0gKHhhd3R2NC0yMDA2MDYxNS1saWJxdWljdGltZS1maXgucGF0Y2gpIPMg7OXt /yDi++f74uD+8iDx7uzt5e3o/y4KzO7m5fIg6vLuLe3o4fPk8iDs7ubl8iDv8O7i5fDo8vwgPwoK UFMgwiBYYXdUViDu8iBTaXN5cGh1cyDy7i3m5SDn4PHy8P/rIO3gIP3y7uwg7+Dy9+UsIO3uIPLg 7CD/IOTg5uUg7eUgCuft4P4g6uDqIO/w4OLo6/zt7iDv5fDl4uXx8ugg8fLw7uroIO3gINHo5+j0 7uLx6ujpIGxpYnF1aWN0aW1lCgrAIPLg6iDv7vLo9e7t7fzq8yDw4OHu8uAg7/Du5OLo4+Dl8vH/ IC0gWGF3VFY0IPHu4ejw4OXy8f8sIO3uIO/u6uAg7eUgCurg7eDr+yDt5SDr7uLo8iAtIOPu4u7w 6PIg7eUg5+3g/iDv5fDl9+Xt/CD34PHy7vIgcnVzc2lhbiA6KSAsIOAgWGF3VFYzIAooIOjnIG9w aHJhZGVkINHo5+j04CApIOfg8fLw/+sg7eAgbGlicXVpY3RpbWUuCgoKLSAK0SAg8+Lg5uXt6OXs INXo9ejtINDz8evg7Qo= --Boundary-01=_uHcxE8ealiLuRAV 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 -urN xawtv-20060615-161048/libng/plugins/write-qt.c xawtv-new/libng/pl= ugins/write-qt.c =2D-- xawtv-20060615-161048/libng/plugins/write-qt.c 2004-02-24 23:09:16 +0= 300 +++ xawtv-new/libng/plugins/write-qt.c 2006-07-23 20:45:19 +0400 @@ -4,9 +4,11 @@ #include #include #include +#include #include #include =2D#include +//#include +//#include =20 #include "grab-ng.h" =20 @@ -336,7 +338,7 @@ int i,j,k,skip,fmtid; unsigned int cmodel; struct qt_video_priv *vp; =2D + int model=3D0; /* handle video encoders */ video =3D malloc(sizeof(qt_vformats)); memcpy(video,qt_vformats,sizeof(qt_vformats)); @@ -348,10 +350,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_get_num_colormodels(); j++) + { + model=3Dqt_get_colormodel(j); =20 + fprintf(stderr," cmodel: %d [%s]\n", model,=20 + lqt_get_colormodel_string(model) ); + } } =20 /* sanity checks */ @@ -378,8 +382,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_get_num_colormodels(); j++) { + cmodel =3D lqt_get_colormodel(j); if (cmodel>=3D sizeof(cmodels)/sizeof(int)) continue; if (!cmodels[cmodel]) diff -urN xawtv-20060615-161048/libng/plugins/write-qt.c xawtv-new/libng/pl= ugins/write-qt.c =2D-- xawtv-20060615-161048/libng/plugins/write-qt.c 2004-02-24 23:09:16 +0= 300 +++ xawtv-new/libng/plugins/write-qt.c 2006-07-23 20:45:19 +0400 @@ -4,9 +4,11 @@ #include #include #include +#include #include #include =2D#include +//#include +//#include =20 #include "grab-ng.h" =20 @@ -336,7 +338,7 @@ int i,j,k,skip,fmtid; unsigned int cmodel; struct qt_video_priv *vp; =2D + int model=3D0; /* handle video encoders */ video =3D malloc(sizeof(qt_vformats)); memcpy(video,qt_vformats,sizeof(qt_vformats)); @@ -348,10 +350,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_get_num_colormodels(); j++) + { + model=3Dqt_get_colormodel(j); =20 + fprintf(stderr," cmodel: %d [%s]\n", model,=20 + lqt_get_colormodel_string(model) ); + } } =20 /* sanity checks */ @@ -378,8 +382,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_get_num_colormodels(); j++) { + cmodel =3D lqt_get_colormodel(j); if (cmodel>=3D sizeof(cmodels)/sizeof(int)) continue; if (!cmodels[cmodel]) --Boundary-01=_uHcxE8ealiLuRAV-- --nextPart2442947.zVoYQKSxVO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) iD8DBQBExcH0gDaarYH/1aQRAhpEAJ49fj81eByUnlrH6GqZFvfzbeHOugCfaEpT 4dRcZyr0xjGCqsykRWv2SzA= =L4Su -----END PGP SIGNATURE----- --nextPart2442947.zVoYQKSxVO--