Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 10:12:52 +0000 (11:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 10:22:39 +0000 (11:22 +0100)
commit4f8540ba40b79cacf14600c0ac2da5f5d5dc604f
tree867bdc0486b43e284b4f37086cf08dade90e9afe
parentb61cb61ab8f9abca98cc8c4d67cbefdb30f1e82a
parent8dc72eeaf647736c287b59a3856a11904bedd58b
Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b'

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

See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/udp.c