Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 12:54:32 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 12:54:52 +0000 (13:54 +0100)
commit6d6eb7c12c833b33ce94e7bd963b1d770defd56c
tree3b4a40e93f46031fc8a4325d18af59d469f39f7a
parent841a288cb32785400261cbab959fcfb982d3f699
parentabae27ed3acd0a7c54f11760c5be2d2653c4edf8
Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'

* commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8':
  rtpdec: Fix the calculation of expected number of packets
  fate: vp3: Fix fate-vp3-coeff-level64 test dependencies

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec.c
tests/fate/vpx.mak
tests/ref/fate/theora-coeff-level64