enable display of background bitmaps (eg, picture subtitles)

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/configure.ac b/configure.ac
index c0a72359eaa1af5bbd913413b78be425bc9eb477..4453726b082065d4abb975e0faefcbb224ff7c6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3752,7 +3752,7 @@ dnl
 AC_ARG_ENABLE(kate,
 [  --enable-kate           kate codec (default enabled)])
 AS_IF([test "${enable_kate}" != "no"], [
-  PKG_CHECK_MODULES(KATE,[kate >= 0.1.1], [
+  PKG_CHECK_MODULES(KATE,[kate >= 0.1.2], [
       VLC_ADD_PLUGIN([kate])
       VLC_ADD_CFLAGS([kate],[$KATE_CFLAGS])
       VLC_ADD_LIBS([kate],[$KATE_LIBS]) ],[

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 90da151519ea732c4833116e42e150f3d76489ee..7024be230f89d5a7446465920aff82583e9bdce9 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -39,7 +39,7 @@
 
 /* #define ENABLE_PACKETIZER */
 /* #define ENABLE_FORMATTING */
-/* #define ENABLE_BITMAPS */
+#define ENABLE_BITMAPS
 
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor
@@ -468,7 +468,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
     p_spu->b_pausable = true;
 
 #ifdef ENABLE_BITMAPS
-    if (ev->bitmap && ev->palette) {
+    if (ev->bitmap && ev->bitmap->type==kate_bitmap_type_paletted && ev->palette) {
         /* create a separate region for the bitmap */
         memset( &fmt, 0, sizeof(video_format_t) );
         fmt.i_chroma = VLC_FOURCC('Y','U','V','P');