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)
* commit '11edeaea3293c41ecf577a330422eabba35f76a2':
  rtpenc_xiph: Don't exclude headers from max_payload_size

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

Simple merge
Simple merge