1 | Initialize variables and member variables |
---|
2 | |
---|
3 | From: Erik Hovland <erik@hovland.org> |
---|
4 | |
---|
5 | |
---|
6 | --- |
---|
7 | |
---|
8 | mythtv/programs/mythtranscode/mpeg2fix.cpp | 1 + |
---|
9 | mythtv/programs/mythtranscode/replex/replex.c | 9 +++++++-- |
---|
10 | 2 files changed, 8 insertions(+), 2 deletions(-) |
---|
11 | |
---|
12 | |
---|
13 | diff --git a/mythtv/programs/mythtranscode/mpeg2fix.cpp b/mythtv/programs/mythtranscode/mpeg2fix.cpp |
---|
14 | index 7058bd7..874c1eb 100644 |
---|
15 | --- a/mythtv/programs/mythtranscode/mpeg2fix.cpp |
---|
16 | +++ b/mythtv/programs/mythtranscode/mpeg2fix.cpp |
---|
17 | @@ -461,6 +461,7 @@ MPEG2replex::MPEG2replex() : |
---|
18 | memset(exttype, 0, sizeof(exttype)); |
---|
19 | memset(exttypcnt, 0, sizeof(exttypcnt)); |
---|
20 | memset(extframe, 0, sizeof(extframe)); |
---|
21 | + memset(ac3frame, 0, sizeof(ac3frame)); |
---|
22 | memset(&seq_head, 0, sizeof(seq_head)); |
---|
23 | memset(&ac3extrbuf, 0, sizeof(ringbuffer) * N_AUDIO); |
---|
24 | memset(&index_ac3extrbuf, 0, sizeof(ringbuffer) * N_AUDIO); |
---|
25 | diff --git a/mythtv/programs/mythtranscode/replex/replex.c b/mythtv/programs/mythtranscode/replex/replex.c |
---|
26 | index 06cb220..51b31be 100644 |
---|
27 | --- a/mythtv/programs/mythtranscode/replex/replex.c |
---|
28 | +++ b/mythtv/programs/mythtranscode/replex/replex.c |
---|
29 | @@ -134,7 +134,9 @@ static void create_fillframe1(ringbuffer *rbuf, int off, int *fsize, |
---|
30 | |
---|
31 | if ( type == MPEG_AUDIO){ |
---|
32 | audio_frame_t afr; |
---|
33 | - get_audio_info(rbuf, &afr, off, fs,0); |
---|
34 | + if (get_audio_info(rbuf, &afr, off, fs,0) < 0) |
---|
35 | + return; |
---|
36 | + |
---|
37 | fs = afr.framesize; |
---|
38 | off += (*fsize-fs); |
---|
39 | } |
---|
40 | @@ -154,7 +156,9 @@ static void create_fillframe2(ringbuffer *rbuf, int off, int *fsize, |
---|
41 | |
---|
42 | if ( type == MPEG_AUDIO){ |
---|
43 | audio_frame_t afr; |
---|
44 | - get_audio_info(rbuf, &afr, off, fs,0); |
---|
45 | + if (get_audio_info(rbuf, &afr, off, fs,0) < 0) |
---|
46 | + return; |
---|
47 | + |
---|
48 | fs = afr.framesize; |
---|
49 | } |
---|
50 | if (rx->fillzero && type == MPEG_AUDIO) |
---|
51 | @@ -2370,6 +2374,7 @@ void do_demux(struct replex *rx) |
---|
52 | multiplex_t mx; |
---|
53 | fprintf(stderr,"STARTING DEMUX\n"); |
---|
54 | |
---|
55 | + memset(&dummy, 0, sizeof(dummy)); |
---|
56 | |
---|
57 | while (!replex_all_set(rx)){ |
---|
58 | if (replex_fill_buffers(rx, 0)< 0){ |
---|