summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2005-05-23 17:13:35 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2005-05-23 17:13:35 +0000
commite076ebde90091c83d16ef31b65741f48d0522f3d (patch)
tree3a0d56c7cc7c876bd2117dac21050baadc30216f /src
parent0cc759bcc2e1c93c7965b40b8a45b41ba521ccc6 (diff)
downloadxine-lib-e076ebde90091c83d16ef31b65741f48d0522f3d.tar.gz
xine-lib-e076ebde90091c83d16ef31b65741f48d0522f3d.tar.bz2
**BUGFIX**
Made sputext working again. CVS patchset: 7559 CVS date: 2005/05/23 17:13:35
Diffstat (limited to 'src')
-rw-r--r--src/libsputext/xine_decoder.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c
index cf3c90252..01486f075 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.88 2004/12/22 21:29:26 mroi Exp $
+ * $Id: xine_decoder.c,v 1.89 2005/05/23 17:13:35 f1rmb Exp $
*
*/
@@ -150,6 +150,7 @@ static void update_output_size (sputext_decoder_t *this) {
unscaled = this->class->use_unscaled &&
(this->stream->video_out->get_capabilities(this->stream->video_out) &
VO_CAP_UNSCALED_OVERLAY);
+
if( unscaled != this->unscaled ) {
this->unscaled = unscaled;
this->width = 0; /* force update */
@@ -174,7 +175,7 @@ static void update_output_size (sputext_decoder_t *this) {
this->height = this->stream->video_out->get_property(this->stream->video_out,
VO_PROP_WINDOW_HEIGHT);
- if( this->width && this->height && this->img_duration ) {
+ if(!this->osd || (this->width && this->height && this->img_duration)) {
this->renderer = this->stream->osd_renderer;
update_font_size (this, 1);
@@ -190,7 +191,7 @@ static void update_output_size (sputext_decoder_t *this) {
this->stream->video_out->status(this->stream->video_out, NULL,
&this->width, &this->height, &this->img_duration );
- if( this->width && this->height && this->img_duration ) {
+ if(!this->osd || ( this->width && this->height && this->img_duration)) {
this->renderer = this->stream->osd_renderer;
update_font_size (this, 1);