Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:31:26 +0000 (01:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:31:26 +0000 (01:31 +0100)
* commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2':
  rtpenc: Restructure if statements in packetizers to simplify adding more conditions

Conflicts:
libavformat/rtpenc_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc_aac.c
libavformat/rtpenc_amr.c
libavformat/rtpenc_xiph.c

Simple merge
Simple merge
@@@ -75,9 -74,10 +75,10 @@@ void ff_rtp_send_xiph(AVFormatContext *
          uint8_t *ptr     = s->buf_ptr + 2 + size; // what we're going to write
          int remaining    = end_ptr - ptr;
  
 -        assert(s->num_frames <= s->max_frames_per_packet);
 +        av_assert1(s->num_frames <= s->max_frames_per_packet);
-         if ((s->num_frames > 0 && remaining < 0) ||
-             s->num_frames == s->max_frames_per_packet) {
+         if (s->num_frames > 0 &&
+             (remaining < 0 ||
+              s->num_frames == s->max_frames_per_packet)) {
              // send previous packets now; no room for new data
              ff_rtp_send_data(s1, s->buf, s->buf_ptr - s->buf, 0);
              s->num_frames = 0;