src/neutrino.cpp: fix conflict, remove old code

Origin commit data
------------------
Branch: ni/coolstream
Commit: a343a64883
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-03-20 11:20:13 +04:00
parent d4f145c48e
commit 5de1dbaebd

View File

@@ -1776,8 +1776,6 @@ TIMER_START();
//init video settings
g_videoSettings = new CVideoSettings;
g_videoSettings->setVideoSettings();
if(display_language_selection)
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/start.jpg");
g_RCInput = new CRCInput();