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)
* commit '2e814d0329aded98c811d0502839618f08642685':
  rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps

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

Simple merge
Simple merge