Merge commit '2e814d0329aded98c811d0502839618f08642685'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:42:25 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:42:30 +0000 (11:42 +0200)
commit57b8ce414be574a772d386f57afa502eac072085
tree7f33dce5aa004c3e2788804016f605f23fc2916e
parent0c8efe48917fd9d6d2c9b61397318c1fd7c3f8c4
parent2e814d0329aded98c811d0502839618f08642685
Merge commit '2e814d0329aded98c811d0502839618f08642685'

* commit '2e814d0329aded98c811d0502839618f08642685':
  rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps

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