Commit af0df274 authored by Tristan Leteurtre's avatar Tristan Leteurtre

parent bb9bbe9b
......@@ -3,7 +3,7 @@
* start, stop, suspend and resume operations.
*-------------------------------------------------------------------------------
* (c)1999-2003 VideoLAN
* $Id: normaltrickplay.cpp,v 1.8 2003/08/06 08:18:52 tooney Exp $
* $Id: normaltrickplay.cpp,v 1.9 2003/08/06 09:31:53 tooney Exp $
*
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
*
......@@ -159,7 +159,6 @@ void C_NormalTrickPlay::DoWork()
pPacket = pPackets->Pop();
ASSERT(pPacket);
HandlePacket(pPacket);
}
}
else
......
......@@ -2,7 +2,7 @@
* ps2ts.cpp: threaded PS to TS converter
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: ps2ts.cpp,v 1.12 2003/08/05 18:03:52 tooney Exp $
* $Id: ps2ts.cpp,v 1.13 2003/08/06 09:31:53 tooney Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -160,8 +160,9 @@ s64 C_Ps2TsMpegConverter::GetNextTsPackets(C_Fifo<C_TsPacket>* pPackets,
bool bDiscontinuity = false;
// Temporary
C_TsPacket * pPacket;
C_TsPacket* pPacket = m_cConverter.GetPacket();
pPackets->Push(pPacket);
switch(m_cConverter.GetStatus())
{
case 0:
......@@ -192,20 +193,15 @@ s64 C_Ps2TsMpegConverter::GetNextTsPackets(C_Fifo<C_TsPacket>* pPackets,
{
C_String strPgrmName = m_pBroadcast->GetProgram()->GetName();
LogDbg(m_hLog, "End of program \"" + strPgrmName + "\" reached");
// Temporary Comments
/* if(pPacket)
m_pTsProvider->ReleasePacket(pPacket);
*/
// Don't need to release here, trickplay module should do it
// m_pTsProvider->ReleasePacket(pPacket);
}
else if (iRc != NO_ERR)
{
C_String strPgrmName = m_pBroadcast->GetProgram()->GetName();
Log(m_hLog, LOG_ERROR, "Read error for program \"" + strPgrmName + "\"");
// Temporary comments
/* if(pPacket)
m_pTsProvider->ReleasePacket(pPacket);
*/
// Don't need to release here, trickplay module should do it
// m_pTsProvider->ReleasePacket(pPacket);
}
return iRc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment