Merge commit '0662440b991361fdb5e732712d997a73e4692e34'

* commit '0662440b991361fdb5e732712d997a73e4692e34':
  rtpenc_aac: Set a default value for max_frames_per_packet at init

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/rtpenc.c

@@ -274,6 +274,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:

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 * s->max_frames_per_packet;
-    const int max_au_headers_size = 2 + 2 * 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;