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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-25 11:36:34 +02:00
parent b28f1676c6 1736a5fca8
commit cd18fa9ca0
37 changed files with 122 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/screenshot.cpp
View File

@@ -274,6 +274,7 @@ bool CScreenShot::SaveFile()
break;
default:
printf("CScreenShot::SaveFile unsupported format %d, using jpeg\n", format);
/* fall through */
case FORMAT_JPG:
ret = SaveJpg();
break;
@@ -513,6 +514,7 @@ void CScreenShot::MakeFileName(const t_channel_id channel_id)
break;
default:
printf("CScreenShot::MakeFileName unsupported format %d, using jpeg\n", format);
/* fall through */
case FORMAT_JPG:
strcat(fname, ".jpg");
break;