[FFmpeg-cvslog] Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 01:17:24 2015 +0100| [9e09931fb6a42446c3e370006eb585d0bbd4f501] | committer: Michael Niedermayer

Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e09931fb6a42446c3e370006eb585d0bbd4f501
---