Merge commit '6b58e11a8331690ec32e9869db89ae10c54614e9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:36:07 +0000 (12:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:38:11 +0000 (12:38 +0200)
* commit '6b58e11a8331690ec32e9869db89ae10c54614e9':
  rtpproto: Add an option for writing return packets to the address of the last received packets

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

Simple merge