diff options
| author | Bastien Nocera <hadess@hadess.net> | 2007-02-08 00:05:37 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2007-02-08 00:05:37 +0000 |
| commit | 22d85acb19734bc6c343f1fe98bce18754075537 (patch) | |
| tree | 25a48fef2535cfba324b7e2be91a6e30c601a857 | |
| parent | 4d2ce359de69c988f76c33e7ea06a54dd0990e96 (diff) | |
| download | totem-22d85acb19734bc6c343f1fe98bce18754075537.tar.gz | |
Fix compile-time warnings, Patch from Götz Waschk to fix the blue-ish
2007-02-08 Bastien Nocera <hadess@hadess.net>
* src/backend/bacon-video-widget-xine.c:
(bacon_video_widget_finalize), (bacon_video_widget_expose),
(bacon_video_widget_get_current_frame): Fix compile-time warnings,
Patch from Götz Waschk to fix the blue-ish images captured by the
thumbnailer (Closes: #402239)
svn path=/trunk/; revision=4011
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/backend/bacon-video-widget-xine.c | 17 |
2 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2007-02-08 Bastien Nocera <hadess@hadess.net> + + * src/backend/bacon-video-widget-xine.c: + (bacon_video_widget_finalize), (bacon_video_widget_expose), + (bacon_video_widget_get_current_frame): Fix compile-time warnings, + Patch from Götz Waschk to fix the blue-ish images captured by the + thumbnailer (Closes: #402239) + 2007-02-07 Bastien Nocera <hadess@hadess.net> * configure.in: Disable the Russian manual for now, as some files are diff --git a/src/backend/bacon-video-widget-xine.c b/src/backend/bacon-video-widget-xine.c index f6b72c47c..6f563c8b1 100644 --- a/src/backend/bacon-video-widget-xine.c +++ b/src/backend/bacon-video-widget-xine.c @@ -474,7 +474,7 @@ bacon_video_widget_finalize (GObject *object) bvw->priv->cursor = NULL; } if (bvw->priv->logo_pixbuf != NULL) { - gdk_pixbuf_unref (bvw->priv->logo_pixbuf); + g_object_unref (bvw->priv->logo_pixbuf); bvw->priv->logo_pixbuf = NULL; } g_free (bvw->priv->vis_name); @@ -1824,7 +1824,7 @@ bacon_video_widget_expose (GtkWidget *widget, GdkEventExpose *event) (w_height - s_height) / 2, s_width, s_height, GDK_RGB_DITHER_NONE, 0, 0); - gdk_pixbuf_unref (logo); + g_object_unref (logo); } return TRUE; @@ -4000,8 +4000,15 @@ bacon_video_widget_get_current_frame (BaconVideoWidget *bvw) break; case XINE_IMGFMT_YV12: y = yuv; - u = yuv + width * height; - v = yuv + width * height * 5 / 4; + /* XXX Work-around xine-lib bug, u and v channels are swapped + * when using xine_get_current_frame */ + if (bvw->priv->type != BVW_USE_TYPE_CAPTURE) { + u = yuv + width * height; + v = yuv + width * height * 5 / 4; + } else { + v = yuv + width * height; + u = yuv + width * height * 5 / 4; + } break; default: g_warning ("Format '%.4s' unsupported", (char *) &format); @@ -4052,7 +4059,7 @@ bacon_video_widget_get_current_frame (BaconVideoWidget *bvw) width, (int) (width * ratio / 10000), GDK_INTERP_BILINEAR); - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); return tmp; } |