Merge commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 20:05:13 +0000 (22:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 20:06:44 +0000 (22:06 +0200)
* commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32':
  udp: Fix pkt_size management

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

Simple merge