Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:17:24 +0000 (01:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:17:27 +0000 (01:17 +0100)
commit9e09931fb6a42446c3e370006eb585d0bbd4f501
treeb2cb9a46bf27fbdbc525b27acc24a0dc08430cfc
parent7e5300958885e8d7e81e4e0183580558183a9a5e
parent11edeaea3293c41ecf577a330422eabba35f76a2
Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'

* commit '11edeaea3293c41ecf577a330422eabba35f76a2':
  rtpenc_xiph: Don't exclude headers from max_payload_size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpenc.c
libavformat/rtpenc_xiph.c