[vlc-devel] commit: Qt Jpeg support on Windows. (Jean-Baptiste Kempf )

git version control git at videolan.org
Fri Sep 12 02:12:07 CEST 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep 11 13:12:57 2008 -0700| [fa2877deff194461e587a3f6574cf1bcd085df4f] | committer: Jean-Baptiste Kempf 

Qt Jpeg support on Windows.

This is a support to statically link jpeg plugin on windows to the plugin in order to make Qt read jpeg files (needed for album art).
This of course, will increase the binary size, but since dionoea is lazy and doesn't want to make easily conversion from jpeg to png|xpm|bmp, here we go. :D
Better solution should be found on master.
(cherry picked from commit 74ca61b171fa7d724cb640a0009f519885da29f0)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa2877deff194461e587a3f6574cf1bcd085df4f
---

 modules/gui/qt4/qt4.cpp |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 5abd569..38e2cf6 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -48,6 +48,11 @@
 #include "../../../share/vlc32x32-christmas.xpm"
 #include <vlc_plugin.h>
 
+#ifdef WIN32
+ #include <QtPlugin>
+ Q_IMPORT_PLUGIN(qjpeg)
+#endif
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/




More information about the vlc-devel mailing list