[FFmpeg-cvslog] Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 19 11:12:52 2015 +0100| [4f8540ba40b79cacf14600c0ac2da5f5d5dc604f] | committer: Michael Niedermayer

Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b'

* commit '8dc72eeaf647736c287b59a3856a11904bedd58b':
  udp: Fix crashes after adding AVOptions

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

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