52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
diff -ru xawtv/libng/plugins/read-mpeg.c xawtv.patched/libng/plugins/read-mpeg.c
|
||
|
|
--- xawtv/libng/plugins/read-mpeg.c 2005-10-08 16:13:11.000000000 +0200
|
||
|
|
+++ xawtv.patched/libng/plugins/read-mpeg.c 2008-12-02 03:33:46.000000000 +0100
|
||
|
|
@@ -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 -ru xawtv/libng/plugins/write-qt.c xawtv.patched/libng/plugins/write-qt.c
|
||
|
|
--- xawtv/libng/plugins/write-qt.c 2004-02-24 21:09:16.000000000 +0100
|
||
|
|
+++ xawtv.patched/libng/plugins/write-qt.c 2008-12-02 03:32:30.000000000 +0100
|
||
|
|
@@ -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])
|