[FFmpeg-cvslog] Merge commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 29 22:05:13 2015 +0200| [83443505090d7749de7ca684f7c338ed0b8cbbab] | committer: Michael Niedermayer

Merge commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32'

* commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32':
  udp: Fix pkt_size management

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

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