Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-10-17 12:45:19 +02:00

View File

@@ -2553,7 +2553,6 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
#endif #endif
frameBuffer->blit2FB(newdata, nw, nh, xoff, yoff); frameBuffer->blit2FB(newdata, nw, nh, xoff, yoff);
free(newdata);
min_x = std::min(min_x, xoff); min_x = std::min(min_x, xoff);
max_x = std::max(max_x, xoff + nw); max_x = std::max(max_x, xoff + nw);