[FFmpeg-cvslog] Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Jan 31 13:19:50 2016 +0000| [899e19f1776c607c126b291a7e0a614782f18f42] | committer: Derek Buitenhuis

Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'

* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
  lavc: Move rtp_payload_size to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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