summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hopf <mat@mshopf.de>2004-11-23 14:35:23 +0000
committerMatthias Hopf <mat@mshopf.de>2004-11-23 14:35:23 +0000
commitcd4bd88a01a28e3d7d2e12eebce6a73c551ef134 (patch)
treeb73240f9a4ae0cdef12de3bd7c37129e60afe213
parent100a9d0edde1bf122b142b06345dc6601f56b360 (diff)
downloadxine-lib-cd4bd88a01a28e3d7d2e12eebce6a73c551ef134.tar.gz
xine-lib-cd4bd88a01a28e3d7d2e12eebce6a73c551ef134.tar.bz2
Added new message type XINE_GUI_SEND_WILL_DESTROY_DRAWABLE.
Fixed bugs in mmx code path of MODE_32_BGR conversion. CVS patchset: 7148 CVS date: 2004/11/23 14:35:23
-rw-r--r--include/xine.h.in5
-rw-r--r--src/video_out/yuv2rgb_mmx.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/include/xine.h.in b/include/xine.h.in
index 021d34327..ac84121b4 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -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.h.in,v 1.132 2004/10/26 20:10:26 miguelfreitas Exp $
+ * $Id: xine.h.in,v 1.133 2004/11/23 14:35:23 mshopf Exp $
*
* public xine-lib (libxine) interface and documentation
*
@@ -1182,6 +1182,9 @@ typedef struct {
/* XVisualInfo **data */
#define XINE_GUI_SEND_SELECT_VISUAL 8
+/* Gui is about to destroy drawable */
+#define XINE_GUI_SEND_WILL_DESTROY_DRAWABLE 9
+
/*********************************************************************
* xine health check stuff *
diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index 0b8cda6ef..4cbd7d29e 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -361,7 +361,7 @@ static inline void mmx_unpack_32bgr (uint8_t * image, int cpu)
/* scheduling: this is hopeless */
movntq (mm6, *image);
- movq_r2r (mm0, mm6);
+ movq_r2r (mm1, mm6);
punpcklbw_r2r (mm2, mm6);
punpckhwd_r2r (mm7, mm6);
movntq (mm6, *(image+8));
@@ -369,7 +369,7 @@ static inline void mmx_unpack_32bgr (uint8_t * image, int cpu)
punpckhbw_r2r (mm3, mm5);
punpcklwd_r2r (mm5, mm4);
movntq (mm4, *(image+16));
- movq_r2r (mm0, mm4);
+ movq_r2r (mm1, mm4);
punpckhbw_r2r (mm2, mm4);
punpckhwd_r2r (mm5, mm4);
movntq (mm4, *(image+24));