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)
commit6cd1dbe6dffe82e7561a52b731f2cb57a3967bc0
tree93fae9001410d0b50afa41a41f97d5e288e9cf55
parent6d6eb7c12c833b33ce94e7bd963b1d770defd56c
parente568db40258d549777ac1c16971678e18a18f5f5
Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'

* commit 'e568db40258d549777ac1c16971678e18a18f5f5':
  rtpdec: Calculate and report packet reception jitter

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