Commit 08c0957f authored by Andrew de Quincey's avatar Andrew de Quincey

Last packet in a PS2TS converted stream is always null. trickplay

wasn't checking for this, and was pushing it into the packet list.
parent 5f141f6a
......@@ -3,7 +3,7 @@
* start, stop, suspend and resume operations.
*-------------------------------------------------------------------------------
* (c)1999-2003 VideoLAN
* $Id: normaltrickplay.cpp,v 1.13 2003/08/14 17:20:36 adq Exp $
* $Id: normaltrickplay.cpp,v 1.14 2003/08/20 21:58:28 adq Exp $
*
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
*
......@@ -175,8 +175,7 @@ void C_NormalTrickPlay::DoWork()
}
else
{
for(int i = 0; i < iVectorSize; i++)
{
while(m_pPackets->Size() > 0) {
pPacket = m_pPackets->Pop();
ASSERT(pPacket);
if (pPacket->RefCount()>0)
......
......@@ -2,7 +2,7 @@
* ps2ts.cpp: threaded PS to TS converter
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: ps2ts.cpp,v 1.15 2003/08/14 14:45:49 adq Exp $
* $Id: ps2ts.cpp,v 1.16 2003/08/20 21:58:28 adq Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -163,7 +163,7 @@ s64 C_Ps2TsMpegConverter::GetNextTsPackets(C_Fifo<C_TsPacket>* pPackets,
// Temporary
C_TsPacket* pPacket = m_cConverter.GetPacket();
pPackets->Push(pPacket);
if (pPacket) pPackets->Push(pPacket);
switch(m_cConverter.GetStatus())
{
......
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