Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 13:00:08 +0000 (14:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 13:00:12 +0000 (14:00 +0100)
* commit 'e568db40258d549777ac1c16971678e18a18f5f5':
  rtpdec: Calculate and report packet reception jitter

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

Simple merge