[FFmpeg-cvslog] Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  1 21:03:10 2015 +0200| [fde2e35e56424e2fc9b05cd763638c1b52b41ca4] | committer: Michael Niedermayer

Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'

* commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc':
  rtp: Map the urloptions to AVOptions

Conflicts:
	libavformat/rtpproto.c

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

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