Ticket #5694: programs_mythtranscode-uninit.patch

File programs_mythtranscode-uninit.patch, 2.1 KB (added by Erik Hovland <erik@…>, 16 years ago)

initialize member vars in ctors

  • mythtv/programs/mythtranscode/mpeg2fix.cpp 

    Fix initialization defects in mythtranscode.

From: Erik Hovland <erik@hovland.org>


---

 mythtv/programs/mythtranscode/mpeg2fix.cpp  |   15 ++++++++++-----
 mythtv/programs/mythtranscode/transcode.cpp |   15 ++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/mythtv/programs/mythtranscode/mpeg2fix.cpp b/mythtv/programs/mythtranscode/mpeg2fix.cpp
index fed2f03..fc343ce 100644
    a b int fill_buffers(void *r, int finish) 
    445445}
    446446
    447447MPEG2replex::MPEG2replex()
     448    : done(0),      otype(0)
     449    , ext_count(0), mplex(0)
    448450{
    449     memset(&vrbuf, 0, sizeof(ringbuffer));
    450     memset(&index_vrbuf, 0, sizeof(ringbuffer));
    451     memset(&extrbuf, 0, sizeof(ringbuffer) * N_AUDIO);
    452     memset(&index_extrbuf, 0, sizeof(ringbuffer) * N_AUDIO);
    453     ext_count = 0;
     451    memset(&vrbuf, 0, sizeof(vrbuf));
     452    memset(extrbuf, 0, sizeof(extrbuf));
     453    memset(&index_vrbuf, 0, sizeof(index_vrbuf));
     454    memset(index_extrbuf, 0, sizeof(index_extrbuf));
     455    memset(exttype, 0, sizeof(exttype));
     456    memset(exttypcnt, 0, sizeof(exttypcnt));
     457    memset(extframe, 0, sizeof(extframe));
     458    memset(&seq_head, 0, sizeof(seq_head));
    454459}
    455460
    456461MPEG2replex::~MPEG2replex()

  • mythtv/programs/mythtranscode/transcode.cpp 

    diff --git a/mythtv/programs/mythtranscode/transcode.cpp b/mythtv/programs/mythtranscode/transcode.cpp
index 04d6aa5..5a67409 100644
    a b class AudioReencodeBuffer : public AudioOutput 
    234234};
    235235
    236236Transcode::Transcode(ProgramInfo *pginfo)
     237    : m_proginfo(pginfo),  keyframedist(0),
     238      nvr(NULL),           nvp(NULL),
     239      inRingBuffer(NULL),  outRingBuffer(NULL),
     240      fifow(NULL),         kfa_table(NULL),
     241      showprogress(false), recorderOptions("")
    237242{
    238     m_proginfo = pginfo;
    239     nvr = NULL;
    240     nvp = NULL;
    241     inRingBuffer = NULL;
    242     outRingBuffer = NULL;
    243     fifow = NULL;
    244     kfa_table = NULL;
    245     showprogress = false;
    246     recorderOptions = "";
    247243}
     244
    248245Transcode::~Transcode()
    249246{
    250247    if (nvr)