virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

rtpenc: Fix memory leaks in the muxer open function

Browse Source 
Also return a proper error code in these cases.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2012-06-17 18:18:16 +03:00
parent 5f26d4d448
commit e9ef88fbd2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rtpenc.c
View File

@@ -198,11 +198,11 @@ static int rtp_write_header(AVFormatContext *s1)
/* max_header_toc_size + the largest AMR payload must fit */ /* max_header_toc_size + the largest AMR payload must fit */
if (1 + s->max_frames_per_packet + n > s->max_payload_size) { if (1 + s->max_frames_per_packet + n > s->max_payload_size) {
av_log(s1, AV_LOG_ERROR, "RTP max payload size too small for AMR\n"); av_log(s1, AV_LOG_ERROR, "RTP max payload size too small for AMR\n");
return -1; goto fail;
} }
if (st->codec->channels != 1) { if (st->codec->channels != 1) {
av_log(s1, AV_LOG_ERROR, "Only mono is supported\n"); av_log(s1, AV_LOG_ERROR, "Only mono is supported\n");
return -1; goto fail;
} }
case CODEC_ID_AAC: case CODEC_ID_AAC:
s->num_frames = 0; s->num_frames = 0;
@@ -216,6 +216,10 @@ defaultcase:
} }
return 0; return 0;
fail:
av_freep(&s->buf);
return AVERROR(EINVAL);
} }
/* send an rtcp sender report packet */ /* send an rtcp sender report packet */