Merge remote-tracking branch 'tuxbox/master'

lib/Makefile.am

@@ -20,5 +20,5 @@ endif
 
 if BOXTYPE_COOL
 SUBDIRS += \
-	libcoolstream
+	hardware/coolstream
 endif

lib/hardware/coolstream/Makefile.am

@@ -0,0 +1,12 @@
+noinst_LIBRARIES = libhwcaps.a
+
+AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
+
+if BOXMODEL_CS_HD2
+AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream
+else
+AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream
+endif
+
+libhwcaps_a_SOURCES = \
+	hardware_caps.cpp

lib/libcoolstream/.svnignore

@@ -1,5 +0,0 @@
-Makefile.in
-.libs
-.deps
-*.la
-*.lo

lib/libcoolstream/Makefile.am

@@ -1,8 +0,0 @@
-noinst_LIBRARIES = libhwcaps.a
-
-AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
-
-AM_CPPFLAGS = -I$(top_srcdir)/lib/libcoolstream
-
-libhwcaps_a_SOURCES = \
-	hardware_caps.cpp

lib/libdvbsub/dvbsubtitle.cpp

@@ -68,8 +68,13 @@ cDvbSubtitleBitmaps::~cDvbSubtitleBitmaps()
     if(sub.rects) {
 	    for (i = 0; i < Count(); i++)
 	    {
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 5, 0)
 		    av_freep(&sub.rects[i]->pict.data[0]);
 		    av_freep(&sub.rects[i]->pict.data[1]);
+#else
+		    av_freep(&sub.rects[i]->data[0]);
+		    av_freep(&sub.rects[i]->data[1]);
+#endif
 		    av_freep(&sub.rects[i]);
 	    }
 
@@ -134,7 +139,11 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y)
 #endif
 
 	for (i = 0; i < Count(); i++) {
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 5, 0)
 		uint32_t * colors = (uint32_t *) sub.rects[i]->pict.data[1];
+#else
+		uint32_t * colors = (uint32_t *) sub.rects[i]->data[1];
+#endif
 		int width = sub.rects[i]->w;
 		int height = sub.rects[i]->h;
 		int xoff, yoff;
@@ -162,7 +171,11 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y)
 //		dbgconverter("cDvbSubtitleBitmaps::Draw: #%d at %d,%d size %dx%d colors %d (x=%d y=%d w=%d h=%d) \n", i+1, 
 //				sub.rects[i]->x, sub.rects[i]->y, sub.rects[i]->w, sub.rects[i]->h, sub.rects[i]->nb_colors, xoff, yoff, nw, nh);
 
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 5, 0)
 		fb_pixel_t * newdata = simple_resize32 (sub.rects[i]->pict.data[0], colors, sub.rects[i]->nb_colors, width, height, nw, nh);
+#else
+		fb_pixel_t * newdata = simple_resize32 (sub.rects[i]->data[0], colors, sub.rects[i]->nb_colors, width, height, nw, nh);
+#endif
 
 #ifdef HAVE_SPARK_HARDWARE
 		// CFrameBuffer::getInstance()->waitForIdle();