Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Mar 2015 22:25:33 +0000 (23:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Mar 2015 23:10:09 +0000 (00:10 +0100)
commit4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7
tree9e4bc555b84b69c3b0fe487d9a0a406971af9641
parent54db7df34b6b816534da8ab6ecf179f115e49f42
parent66028b7ba6b411ba12ef553e9c8f1f4a4fe27710
Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'

* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
  udp: Use AVOptions

Conflicts:
libavformat/udp.c

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