mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-03-07 19:43:06 +01:00
parent 113edb58c6 4c19475bd1
commit 587fa7d77a
54 changed files with 216 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libdvbsub/dvbsubtitle.cpp
View File

@@ -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();