git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab59c17
)
allow some other image sizes in movie->addFrame().
author
kramm
<kramm>
Mon, 1 Nov 2004 10:33:57 +0000
(10:33 +0000)
committer
kramm
<kramm>
Mon, 1 Nov 2004 10:33:57 +0000
(10:33 +0000)
lib/python/tags.c
patch
|
blob
|
history
diff --git
a/lib/python/tags.c
b/lib/python/tags.c
index
1550b18
..
6da2f73
100644
(file)
--- a/
lib/python/tags.c
+++ b/
lib/python/tags.c
@@
-817,10
+817,12
@@
static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwa
static char *kwlist[] = {"image", "quant", "type", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|is", kwlist, &image, &quant, &type))
return NULL;
static char *kwlist[] = {"image", "quant", "type", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|is", kwlist, &image, &quant, &type))
return NULL;
- if(fi->stream->width != image_getWidth(image)) {
+ if(fi->stream->width != image_getWidth(image) &&
+ fi->stream->owidth != image_getWidth(image)) {
PyErr_SetString(PyExc_Exception, setError("bad image width %d!=%d", image_getWidth(image), fi->stream->width));return 0;
}
PyErr_SetString(PyExc_Exception, setError("bad image width %d!=%d", image_getWidth(image), fi->stream->width));return 0;
}
- if(fi->stream->height != image_getHeight(image)) {
+ if(fi->stream->height != image_getHeight(image) &&
+ fi->stream->oheight != image_getHeight(image)) {
PyErr_SetString(PyExc_Exception, setError("bad image width %d!=%d", image_getHeight(image), fi->stream->height));return 0;
}
PyObject*tag = tag_new(&videoframe_tag);
PyErr_SetString(PyExc_Exception, setError("bad image width %d!=%d", image_getHeight(image), fi->stream->height));return 0;
}
PyObject*tag = tag_new(&videoframe_tag);