Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 20:03:34 +0000 (22:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 20:03:51 +0000 (22:03 +0200)
* commit 'abb810db036628e11a5171134ebe320b187ee6d6':
  Revert "rtpenc_chain: Don't copy the time_base back to the caller"

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

Simple merge