Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions libdvbmpeg/remux.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,6 @@ int get_video_info(Remux *rem)
uint8_t *headr;
int found = 0;
int sw;
long off = 0;
int form = -1;
ringbuffy *vid_buffy = &rem->vid_buffy;
VideoInfo *vi = &rem->video_info;
Expand All @@ -494,7 +493,6 @@ int get_video_info(Remux *rem)
if ( b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01
&& b[3] == 0xb3) found = 4;
else {
off++;
vring_read( rem, b, 1);
}
}
Expand Down Expand Up @@ -604,7 +602,6 @@ int get_audio_info( Remux *rem)
{
uint8_t *headr;
uint8_t buf[3];
long off = 0;
int found = 0;
ringbuffy *aud_buffy = &rem->aud_buffy;
AudioInfo *ai = &rem->audio_info;
Expand All @@ -618,7 +615,6 @@ int get_audio_info( Remux *rem)
if ( b[0] == 0xff && (b[1] & 0xf8) == 0xf8)
found = 2;
else {
off++;
aring_read( rem, b, 1);
}
}
Expand Down Expand Up @@ -831,7 +827,6 @@ void remux(int fin, int fout, int pack_size, int mult)
long pos = 0;
int r = 0;
int i, r1, r2;
long packets = 0;
uint8_t mpeg_end[4] = { 0x00, 0x00, 0x01, 0xB9 };
uint32_t SCR_inc = 0;
int data_size;
Expand Down Expand Up @@ -963,7 +958,6 @@ void remux(int fin, int fout, int pack_size, int mult)
vbuf += vpack_size;
vbufn = add_pts( vbufl, rem.vdts, vpack_size,
0, vbufn, 0);
packets++;
} else if ( abuf+asize < abuf_max && asize &&
ok_video ){
fprintf(stderr,"2 ");
Expand All @@ -972,7 +966,6 @@ void remux(int fin, int fout, int pack_size, int mult)
abuf += apack_size;
abufn = add_pts( abufl, rem.apts, apack_size,
0, abufn, 0);
packets++;
} else if ( abuf+asize < abuf_max && asize &&
!ok_audio){
fprintf(stderr,"3 ");
Expand All @@ -981,7 +974,6 @@ void remux(int fin, int fout, int pack_size, int mult)
abuf += apack_size;
abufn = add_pts( abufl, rem.apts, apack_size,
0, abufn, 0);
packets++;
} else if (vbuf+vsize < vbuf_max && vsize &&
!ok_video){
fprintf(stderr,"4 ");
Expand All @@ -990,7 +982,6 @@ void remux(int fin, int fout, int pack_size, int mult)
vbuf += vpack_size;
vbufn = add_pts( vbufl, rem.vdts, vpack_size,
0, vbufn, 0);
packets++;
} else {
fprintf(stderr,"5 ");
pos = write_ps_header(buf,rem.SCR,rem.muxr, 1, 0, 0,
Expand Down
2 changes: 1 addition & 1 deletion server/livestreamer.c
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ void cStreamdevLiveStreamer::ChannelChange(const cChannel *Channel)
}
}

if (m_Device = cDevice::GetDevice(Channel, LIVEPRIORITY, false)) {
if ((m_Device = cDevice::GetDevice(Channel, LIVEPRIORITY, false))) {
if (m_Device->SwitchChannel(Channel, false)) {
Attach();
} else {
Expand Down