Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:18:25 +0000 (14:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:18:30 +0000 (14:18 +0100)
commitb4581e9394c9f97d08af814d09337ed16f21cfe0
treec1af301bb0e8eaab4e57a1cf6f6bb984cbe53167
parent1d2abca7e1f09ccd2f14b4d452aab584362fad33
parent4a4a7e138c92901e04db46a6b05cc6948023e5f5
Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'

* commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5':
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set

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