kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-11785 [mod_av] fix a couple dead assignments and inconsistent assumption that mm pointer could be NULL

This commit is contained in:
Chris Rienzo 2019-04-15 20:25:25 +00:00 committed by Andrey Volk
parent 581ec1287d
commit 2a8e07d6ef
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mod/applications/mod_av/avformat.c
View File

@ -478,21 +478,20 @@ GCC_DIAG_ON(deprecated-declarations)
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (mm) { switch_assert(mm);
if (mm->vbuf) {
buffer_bytes = mm->vbuf;
}
if (mm->fps) {
fps = mm->fps;
} else {
mm->fps = fps;
}
if (mm->vw && mm->vh) { if (mm->vbuf) {
mst->width = mm->vw; buffer_bytes = mm->vbuf;
mst->height = mm->vh; }
} if (mm->fps) {
fps = mm->fps;
} else {
mm->fps = fps;
}
if (mm->vw && mm->vh) {
mst->width = mm->vw;
mst->height = mm->vh;
} }
c->codec_id = codec_id; c->codec_id = codec_id;
@ -559,9 +558,6 @@ GCC_DIAG_ON(deprecated-declarations)
} }
} }
switch_assert(mm);
if (mm->cbr) { if (mm->cbr) {
c->rc_min_rate = c->bit_rate; c->rc_min_rate = c->bit_rate;
c->rc_max_rate = c->bit_rate; c->rc_max_rate = c->bit_rate;
@ -923,7 +919,7 @@ GCC_DIAG_ON(deprecated-declarations)
if (got_packet) { if (got_packet) {
switch_mutex_lock(context->eh.mutex); switch_mutex_lock(context->eh.mutex);
GCC_DIAG_OFF(deprecated-declarations) GCC_DIAG_OFF(deprecated-declarations)
ret = write_frame(context->eh.fc, &context->eh.video_st->st->codec->time_base, context->eh.video_st->st, &pkt); write_frame(context->eh.fc, &context->eh.video_st->st->codec->time_base, context->eh.video_st->st, &pkt);
GCC_DIAG_ON(deprecated-declarations) GCC_DIAG_ON(deprecated-declarations)
switch_mutex_unlock(context->eh.mutex); switch_mutex_unlock(context->eh.mutex);
av_packet_unref(&pkt); av_packet_unref(&pkt);
@ -2515,7 +2511,6 @@ GCC_DIAG_ON(deprecated-declarations)
switch_yield(1000); switch_yield(1000);
} }
frame->img = img; frame->img = img;
do_fl = 0;
} else { } else {
if (switch_micro_time_now() - mst->next_pts > -10000) { if (switch_micro_time_now() - mst->next_pts > -10000) {
frame->img = img; frame->img = img;