diff options
| -rw-r--r-- | libavformat/rtpenc.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpenc_aac.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 0c1f57a50d..b306a4cd9a 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -271,6 +271,8 @@ static int rtp_write_header(AVFormatContext *s1) goto defaultcase; case AV_CODEC_ID_AAC: s->num_frames = 0; + if (!s->max_frames_per_packet) + s->max_frames_per_packet = 5; goto defaultcase; default: defaultcase: diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c index 8e39605979..7dcdec9499 100644 --- a/libavformat/rtpenc_aac.c +++ b/libavformat/rtpenc_aac.c @@ -27,8 +27,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size) RTPMuxContext *s = s1->priv_data; int len, max_packet_size; uint8_t *p; - const int max_frames_per_packet = s->max_frames_per_packet ? s->max_frames_per_packet : 5; - const int max_au_headers_size = 2 + 2 * max_frames_per_packet; + const int max_au_headers_size = 2 + 2 * s->max_frames_per_packet; /* skip ADTS header, if present */ if ((s1->streams[0]->codec->extradata_size) == 0) { @@ -39,7 +38,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size) /* test if the packet must be sent */ len = (s->buf_ptr - s->buf); - if ((s->num_frames == max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) { + if ((s->num_frames == s->max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) { int au_size = s->num_frames * 2; p = s->buf + max_au_headers_size - au_size - 2; |