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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-13 01:48:39 +01:00
parent 6281d1f066 da356003f8
commit 531b7b2cc0
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/audiodec/ffmpegdec.cpp
View File

@@ -314,7 +314,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
}
if (rpacket.stream_index != best_stream) {
av_free_packet(&rpacket);
av_packet_unref(&rpacket);
continue;
}
@@ -373,7 +373,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
}
if (time_played && avc->streams[best_stream]->time_base.den)
*time_played = (pts - start_pts) * avc->streams[best_stream]->time_base.num / avc->streams[best_stream]->time_base.den;
av_free_packet(&rpacket);
av_packet_unref(&rpacket);
} while (*state!=STOP_REQ && Status==OK);
audioDecoder->StopClip();
@@ -381,7 +381,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
swr_free(&swr);
av_free(outbuf);
av_free_packet(&rpacket);
av_packet_unref(&rpacket);
av_frame_free(&frame);
avcodec_close(c);
//av_free(avcc);

4
src/driver/record.cpp
View File

@@ -2285,7 +2285,7 @@ void CStreamRec::run()
AVPacket newpkt = pkt;
if (av_bitstream_filter_filter(bsfc, codec, NULL, &newpkt.data, &newpkt.size, pkt.data, pkt.size, pkt.flags & AV_PKT_FLAG_KEY) >= 0) {
av_free_packet(&pkt);
av_packet_unref(&pkt);
newpkt.buf = av_buffer_create(newpkt.data, newpkt.size, av_buffer_default_free, NULL, 0);
pkt = newpkt;
}
@@ -2294,7 +2294,7 @@ void CStreamRec::run()
pkt.dts = av_rescale_q(pkt.dts, ifcx->streams[pkt.stream_index]->time_base, ofcx->streams[pkt.stream_index]->time_base);
av_write_frame(ofcx, &pkt);
av_free_packet(&pkt);
av_packet_unref(&pkt);
if (pkt.stream_index == stream_index) {
total += (double) 1000 * pkt.duration * av_q2d(ifcx->streams[stream_index]->time_base);

4
src/driver/streamts.cpp
View File

@@ -900,7 +900,7 @@ void CStreamStream::run()
AVPacket newpkt = pkt;
if (av_bitstream_filter_filter(bsfc, codec, NULL, &newpkt.data, &newpkt.size, pkt.data, pkt.size, pkt.flags & AV_PKT_FLAG_KEY) >= 0) {
av_free_packet(&pkt);
av_packet_unref(&pkt);
newpkt.buf = av_buffer_create(newpkt.data, newpkt.size, av_buffer_default_free, NULL, 0);
pkt = newpkt;
}
@@ -909,7 +909,7 @@ void CStreamStream::run()
pkt.dts = av_rescale_q(pkt.dts, ifcx->streams[pkt.stream_index]->time_base, ofcx->streams[pkt.stream_index]->time_base);
av_write_frame(ofcx, &pkt);
av_free_packet(&pkt);
av_packet_unref(&pkt);
}
av_read_pause(ifcx);

6
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -441,7 +441,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
if (channel->getChannelID() == current_channel)
yresult += "<a name=\"akt\"></a>\n";
yresult += string_printf("<a class=\"clist\" href=\"javascript:do_zap('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
yresult += string_printf("<a class=\"clist\" href=\"javascript:do_zap('" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "')\">"
"%d. %s%s"
"</a>\n"
, channel->getChannelID()
@@ -473,7 +473,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
}
if (event.eventID)
{
yresult += string_printf("<a href=\"javascript:do_epg('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"','"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
yresult += string_printf("<a href=\"javascript:do_epg('" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "','" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "')\">"
"<img src=\"/images/elist.png\" alt=\"Program preview\" title=\"EPG\" />"
"</a>\n"
, channel->getChannelID()
@@ -481,7 +481,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
);
}
yresult += string_printf("<a href=\"javascript:do_stream('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"','%s')\">"
yresult += string_printf("<a href=\"javascript:do_stream('" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "','%s')\">"
"<img src=\"/images/stream.png\" alt=\"Stream\" title=\"Stream\" />"
"</a>\n"
, channel->getChannelID()

3
src/timerd/timermanager.cpp
View File

@@ -292,9 +292,10 @@ int CTimerManager::unlockEvents()
bool CTimerManager::listEvents(CTimerEventMap &Events)
{
/* events is passed as reference and thus its address is never NULL
if(!&Events)
return false;
*/
Events.clear();
for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); ++pos)

6
src/zapit/src/zapit.cpp
View File

@@ -925,7 +925,7 @@ bool CZapit::ChangeAudioPid(uint8_t index)
return false;
/* stop demux filter */
if (audioDemux->Stop() < 0)
if (audioDemux->Stop() == false)
return false;
/* stop audio playback */
@@ -947,11 +947,11 @@ bool CZapit::ChangeAudioPid(uint8_t index)
SetAudioStreamType(currentAudioChannel->audioChannelType);
/* set demux filter */
if (audioDemux->pesFilter(current_channel->getAudioPid()) < 0)
if (audioDemux->pesFilter(current_channel->getAudioPid()) == false)
return false;
/* start demux filter */
if (audioDemux->Start() < 0)
if (audioDemux->Start() == false)
return false;
/* start audio playback */