stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

libav: fixed minor memory leak when errors accurs.

Browse source
This commit is contained in:
John Törnblom 2013-03-17 14:25:02 +01:00
parent ba9c4fd1f4
commit e622db159f
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/muxer/muxer_libav.c
View file

@ -349,6 +349,7 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
AVPacket packet;
th_pkt_t *pkt = (th_pkt_t*)data;
lav_muxer_t *lm = (lav_muxer_t*)m;
int rc = 0;
assert(smt == SMT_PACKET);
@ -356,14 +357,14 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
if(!oc->nb_streams) {
tvhlog(LOG_ERR, "libav", "No streams to mux");
lm->m_errors++;
return -1;
rc = -1;
goto ret;
}
if(!lm->lm_init) {
tvhlog(LOG_ERR, "libav", "Muxer not initialized correctly");
lm->m_errors++;
return -1;
rc = -1;
goto ret;
}
for(i=0; i<oc->nb_streams; i++) {
@ -401,11 +402,8 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
if(pkt->pkt_frametype < PKT_P_FRAME)
packet.flags |= AV_PKT_FLAG_KEY;
if (av_interleaved_write_frame(oc, &packet) != 0) {
tvhlog(LOG_WARNING, "libav", "Failed to write frame");
lm->m_errors++;
return -1;
}
if((rc = av_interleaved_write_frame(oc, &packet)))
tvhlog(LOG_WARNING, "libav", "Failed to write frame");
// h264_mp4toannexb filter might allocate new data.
if(packet.data != pktbuf_ptr(pkt->pkt_payload))
@ -414,9 +412,11 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
break;
}
ret:
lm->m_errors += (rc != 0);
pkt_ref_dec(pkt);
return 0;
return rc;
}