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 #include #include -#include -#include -#include +#include +#include +#include #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 #include #include -#include -#include -#include +#include +#include +#include #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])