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)
commit692757062a89c0be5e3da8d55a652339afe679ec
treed499f603da939e2a73b62b2e2f2341592ff0cb7b
parentd136fe6fd7be03b3edc87bb19c81a09a31b1a733
parentabb810db036628e11a5171134ebe320b187ee6d6
Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'

* commit 'abb810db036628e11a5171134ebe320b187ee6d6':
  Revert "rtpenc_chain: Don't copy the time_base back to the caller"

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