mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2553,7 +2553,6 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
|
||||
#endif
|
||||
|
||||
frameBuffer->blit2FB(newdata, nw, nh, xoff, yoff);
|
||||
free(newdata);
|
||||
|
||||
min_x = std::min(min_x, xoff);
|
||||
max_x = std::max(max_x, xoff + nw);
|
||||
|
Reference in New Issue
Block a user